pfab 0.53.0 → 0.54.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06aa820e3141930ca45a670075b6824a23010f5f3568aa3c81edd1825ea452c2
-  data.tar.gz: 9d43a1c6d16ac3e44f057817fa50f0143d7e3ce6d9b9ca0446735ae060144dfe
+  metadata.gz: 76cf1e72c2d80c355fdcd4d6a1d4029966302d885106239d4f440b02cd1ecec0
+  data.tar.gz: a89e2b49a230499c16dfacd205b9a025529a72f99bd9d89d0e143d7d90fdbce8
 SHA512:
-  metadata.gz: 9e42f6a07719549799f99885888d33218dd69b0211e07ea7d927bf22b4d6d39984a4d246aa7f1c99afa8ccdd273eb2d96292363cb167b0a7c1c09e7ecff73464
-  data.tar.gz: 655b9ecb7007a4c19e27591a6edbe2acefcbce8a374ade1b1fb2e97985089503ae875d156cf269d969984f02e1dc148ca1e86a7702c444aab8e5b33fd65bc288
+  metadata.gz: f8250a9a5c42ebdfb55d22c076c4a6be32a1c2596b720b2e77e60b35c86e92879116df789cdda86571e26ce2a0f2e9c1b3da7f4c4bc1edfa60ee81bb8115bc1e
+  data.tar.gz: c1517c24b3d9cde49f77a65b02084b3e200869d529c4c08753378761cb5466ef7ceda829438d65d29cd30718183d7bd4a3fd8fc73684e238167286dc0e88e0f2

data/lib/pfab/templates/web.rb

@@ -1,6 +1,7 @@
 require "rubygems/safe_yaml"
 
 module Pfab
+  LABEL_DEPLOY_UNIQUE_ID = "deploy-unique-id"
   module Templates
     class Web < Base
       def write_to(f)
@@ -187,10 +188,7 @@ module Pfab
 
 
       def anti_affinity
-        p = host_anti_affinity
-        z = zone_anti_affinity
-        m =  merge_anti_affinity(p, z)
-        return m
+        return host_anti_affinity
       end
 
 
@@ -198,63 +196,57 @@ module Pfab
         anti_affinity_builder(ANTI_AFFINITY_MODE, ANTI_AFFINITY_PREFERRED_MODE_WEIGHT, "kubernetes.io/hostname")
       end
 
-      def zone_anti_affinity
-        anti_affinity_builder(ZONE_ANTI_AFFINITY_MODE, ZONE_ANTI_AFFINITY_PREFERRED_MODE_WEIGHT, "topology.kubernetes.io/zone")
-      end
 
-      def merge_anti_affinity(pod_anti_affinity, zone_anti_affinity)
-        merged = {}
+      def topology_spread_constraints
+        waiveTopologySpreadConstraints = get("waiveTopologySpreadConstraints") || false
 
-        if pod_anti_affinity.empty? && zone_anti_affinity.empty?
-          merged = {}
-        elsif pod_anti_affinity.empty?
-          merged = zone_anti_affinity
-        elsif zone_anti_affinity.empty?
-          merged = pod_anti_affinity
-        else
-          merged[:podAntiAffinity] = {}
-
-          required_key = :requiredDuringSchedulingIgnoredDuringExecution
-          preferred_key = :preferredDuringSchedulingIgnoredDuringExecution
-
-          [required_key, preferred_key].each do |key|
-            if pod_anti_affinity.dig(:podAntiAffinity, key) && zone_anti_affinity.dig(:podAntiAffinity, key)
-              merged[:podAntiAffinity][key] = pod_anti_affinity[:podAntiAffinity][key] + zone_anti_affinity[:podAntiAffinity][key]
-            elsif pod_anti_affinity.dig(:podAntiAffinity, key)
-              merged[:podAntiAffinity][key] = pod_anti_affinity[:podAntiAffinity][key]
-            elsif zone_anti_affinity.dig(:podAntiAffinity, key)
-              merged[:podAntiAffinity][key] = zone_anti_affinity[:podAntiAffinity][key]
-            end
-          end
-        end
+        schedulingRule = waiveTopologySpreadConstraints ? "ScheduleAnyway" : "DoNotSchedule"
+
+        zone_constraint = {
+          maxSkew: 1,
+          topologyKey: "topology.kubernetes.io/zone",
+          whenUnsatisfiable: schedulingRule,
+          labelSelector: labelSelector
+        }
+        host_constraint = {
+          maxSkew: 1,
+          topologyKey: "kubernetes.io/hostname",
+          whenUnsatisfiable: schedulingRule,
+          labelSelector: labelSelector
 
-        merged
+        }
+        [zone_constraint, host_constraint]
       end
 
 
+
+      def labelSelector
+        {
+          matchExpressions: [
+          {
+            key: "deployed-name",
+            operator: "In",
+            values: [
+              @data['deployed_name']
+            ]
+          },
+          {
+            key: LABEL_DEPLOY_UNIQUE_ID,
+            operator: "In",
+            values: [
+              StyledYAML.double_quoted(deploy_unique_id)
+            ]
+          }
+        ]
+        }
+      end
+
       def anti_affinity_builder(key, weight_key, topology_key)
         antiAffinityMode = get(key) || "disabled"
         if antiAffinityMode
           affinitySelector = {
             topologyKey: topology_key,
-            labelSelector: {
-              matchExpressions: [
-                {
-                  key: "deployed-name",
-                  operator: "In",
-                  values: [
-                    @data['deployed_name']
-                  ]
-                },
-                {
-                  key: "deployment-unique-id",
-                  operator: "In",
-                  values: [
-                    StyledYAML.double_quoted(deploy_unique_id)
-                  ]
-                }
-              ]
-            },
+            labelSelector: labelSelector,
           }
 
           return case antiAffinityMode
@@ -328,7 +320,7 @@ module Pfab
               "deployed-name" => @data['deployed_name'],
               "application-type" => application_type,
               "deploy-id" => deploy_id,
-              "deploy-unique-id" => StyledYAML.double_quoted(deploy_unique_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'])
@@ -356,7 +348,7 @@ module Pfab
                   application: @data['application'],
                   "deployed-name" => @data['deployed_name'],
                   "application-type" => "web",
-                  "deploy-unique-id" => StyledYAML.double_quoted(deploy_unique_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'])
@@ -381,7 +373,7 @@ module Pfab
                     volumeMounts: volume_mounts
                   }.compact
                 ],
-                affinity:  anti_affinity,
+                topologySpreadConstraints: topology_spread_constraints,
                 volumes: volumes
               }.compact,
             },

data/lib/pfab/version.rb

@@ -1,8 +1,8 @@
 module Pfab
   module Version
     MAJOR = 0
-    MINOR = 53
-    PATCH = 0
+    MINOR = 54
+    PATCH = 1
     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.53.0 ruby lib
+# stub: pfab 0.54.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.53.0"
+  s.version = "0.54.1"
 
   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-14"
+  s.date = "2024-05-15"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.53.0
+  version: 0.54.1
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-14 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander