pfab 0.51.0 → 0.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2ffa684bec7e96dac9c896b6f037f02e9c73e2c9c2943c47fc400c59c0d490d
-  data.tar.gz: a69b88c63cdc12a417c2ed80373c69b31ba5662c412efa6131dfc51168b2b7fa
+  metadata.gz: e19f6543864483d014f040e4d0ba5c2e8322bb20ca5604f351c13a36f53b20cd
+  data.tar.gz: 1d1afb9c39e0e6d69f5849bd171e2a659174ec747c601239c6e9cc051da92d6f
 SHA512:
-  metadata.gz: 24b51d55f108f38c95b6ae05a46104353033240a10a18481dafc56185377e9ae66735dc99f3c29276067bb361e16efa376dda5b05e7e33ff1e1abdbad0bf6429
-  data.tar.gz: 361531b33dfec0ce581c53d7049d6142792d4264a76a975f252c590ce0aee973412196edbdd3972c6c800fdd6176c1dc968abd6817524b59a65e38fcb9fdf284
+  metadata.gz: c402604e6fd169342b2aff975ecb79b15b59cf67399c91a57c15597df3b7629d0a0eb84c5df14e784c09ca4612fafdad60e620bae52a76f1da269030c05d9fa4
+  data.tar.gz: 569c405d1a4be90a456ef7dbb8f5e3cadf842b475644dbb79e85fc6d2765dc557e75b147dba2c58ae88c67ef37d0cab5f45bf9c000983ccb69535597c1a42d40

data/lib/pfab/templates/web.rb

@@ -180,12 +180,64 @@ module Pfab
       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
-        if app_vars.has_key?(ANTI_AFFINITY_MODE)
-          antiAffinityMode = app_vars[ANTI_AFFINITY_MODE]
+        p = host_anti_affinity
+        z = zone_anti_affinity
+        printf("host anti affinity: %s\n", p)
+        printf("zone anti affinity: %s\n", z)
+        m =  merge_anti_affinity(p, z)
+        printf("merged anti affinity: %s\n", m)
+        return m
+      end
+
+
+      def host_anti_affinity
+        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 = {}
+
+        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
+
+        merged
+      end
+
+
+      def anti_affinity_builder(key, weight_key, topology_key)
+        antiAffinityMode = get(key) || "disabled"
+        if antiAffinityMode
           affinitySelector = {
-            topologyKey: "kubernetes.io/hostname",
+            topologyKey: topology_key,
             labelSelector: {
               matchLabels: {
                 "deployed-name" => @data['deployed_name'],
@@ -207,14 +259,14 @@ module Pfab
                    { podAntiAffinity: {
                      preferredDuringSchedulingIgnoredDuringExecution: [
                        {
-                         weight: app_vars[ANTI_AFFINITY_PREFERRED_MODE_WEIGHT] || 100,
+                         weight: app_vars[weight_key] || 100,
                          podAffinityTerm: affinitySelector
                        }
                      ]
                    }
                    }
                  else
-                   raise "Unexpected value #{antiAffinityMode} specified for `#{ANTI_AFFINITY_MODE}`. Valid selections are #{ANTI_AFFINITY_TYPES}"
+                   raise "Unexpected value #{antiAffinityMode} specified for `#{key}`. Valid selections are #{ANTI_AFFINITY_TYPES}"
                  end
         end
         return {}

data/lib/pfab/version.rb

@@ -1,7 +1,7 @@
 module Pfab
   module Version
     MAJOR = 0
-    MINOR = 51
+    MINOR = 52
     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.51.0 ruby lib
+# stub: pfab 0.52.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.51.0"
+  s.version = "0.52.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.51.0
+  version: 0.52.0
 platform: ruby
 authors:
 - Jeff Dwyer