pfab 0.51.0 → 0.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2ffa684bec7e96dac9c896b6f037f02e9c73e2c9c2943c47fc400c59c0d490d
-  data.tar.gz: a69b88c63cdc12a417c2ed80373c69b31ba5662c412efa6131dfc51168b2b7fa
+  metadata.gz: 06aa820e3141930ca45a670075b6824a23010f5f3568aa3c81edd1825ea452c2
+  data.tar.gz: 9d43a1c6d16ac3e44f057817fa50f0143d7e3ce6d9b9ca0446735ae060144dfe
 SHA512:
-  metadata.gz: 24b51d55f108f38c95b6ae05a46104353033240a10a18481dafc56185377e9ae66735dc99f3c29276067bb361e16efa376dda5b05e7e33ff1e1abdbad0bf6429
-  data.tar.gz: 361531b33dfec0ce581c53d7049d6142792d4264a76a975f252c590ce0aee973412196edbdd3972c6c800fdd6176c1dc968abd6817524b59a65e38fcb9fdf284
+  metadata.gz: 9e42f6a07719549799f99885888d33218dd69b0211e07ea7d927bf22b4d6d39984a4d246aa7f1c99afa8ccdd273eb2d96292363cb167b0a7c1c09e7ecff73464
+  data.tar.gz: 655b9ecb7007a4c19e27591a6edbe2acefcbce8a374ade1b1fb2e97985089503ae875d156cf269d969984f02e1dc148ca1e86a7702c444aab8e5b33fd65bc288

data/Gemfile.lock

@@ -18,11 +18,12 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.3)
+    activesupport (6.1.7.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     builder (3.2.4)
@@ -30,7 +31,7 @@ GEM
     coderay (1.1.3)
     commander (4.4.6)
       highline (~> 1.7.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.3)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     docile (1.3.1)
@@ -64,27 +65,27 @@ GEM
       oauth2 (~> 1.0)
     hashie (3.6.0)
     highline (1.7.10)
-    i18n (1.8.11)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     json (1.8.6)
     jwt (2.3.0)
     kamelcase (0.0.2)
       semver2 (~> 3)
     method_source (1.0.0)
-    mini_portile2 (2.8.0)
-    minitest (5.15.0)
+    mini_portile2 (2.8.6)
+    minitest (5.22.3)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.13.6)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.16.5)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oauth2 (1.4.7)
-      faraday (>= 0.8, < 2.0)
+    oauth2 (1.4.11)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
+      rack (>= 1.2, < 4)
     power_assert (1.1.3)
     pry (0.14.2)
       coderay (~> 1.1)
@@ -94,8 +95,8 @@ GEM
       pry (>= 0.13, < 0.15)
     psych (4.0.2)
     public_suffix (4.0.6)
-    racc (1.6.0)
-    rack (2.2.3)
+    racc (1.7.3)
+    rack (3.0.11)
     rake (13.0.6)
     rchardet (1.8.0)
     rdoc (3.12.2)
@@ -111,8 +112,9 @@ GEM
     test-unit (3.2.9)
       power_assert
     thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.6.14)
 
 PLATFORMS
   ruby

data/lib/pfab/cli.rb

@@ -4,6 +4,7 @@ require "yaml"
 require "json"
 require 'active_support/core_ext/hash/indifferent_access'
 require 'styled_yaml'
+require 'digest'
 
 module Pfab
   class CLI
@@ -16,6 +17,7 @@ module Pfab
 
       if File.exist? "application.yaml"
         @application_yaml = YAML.load(File.read("application.yaml")).with_indifferent_access
+        @application_yaml_hash = Digest::SHA256.hexdigest(@application_yaml.to_json)
       else
         raise "I need to be run in a directory with a application.yaml"
       end
@@ -291,6 +293,7 @@ module Pfab
     def yy
       Pfab::Yamls.new(apps: all_runnables,
                       application_yaml: @application_yaml,
+                      application_yaml_hash: @application_yaml_hash,
                       env: $env,
                       sha: get_current_sha,
                       image_name: image_name,

data/lib/pfab/templates/base.rb

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module Pfab
   module Templates
     class Base
@@ -63,6 +65,10 @@ module Pfab
         "#{@data['application']}.#{application_type}.#{@data['deployed_name']}"
       end
 
+      def deploy_unique_id
+        @data['sha'] + "-" + @data['application_yaml_hash'][0,8]
+      end
+
       def env_from
         env_from = []
         env_from << @data.dig("application_yaml", :env_from)

data/lib/pfab/templates/web.rb

@@ -14,7 +14,9 @@ module Pfab
             puts "skipping ingress because ingress_disabled = #{@data['generateIngressEnabled']}"
           end
           f << StyledYAML.dump(deployment.deep_stringify_keys)
-          f << StyledYAML.dump(pod_disruption_budget.deep_stringify_keys)
+          if get("replicas") || 1 > 1
+            f << StyledYAML.dump(pod_disruption_budget.deep_stringify_keys)
+          end
         end
       end
 
@@ -180,16 +182,78 @@ 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
+        m =  merge_anti_affinity(p, z)
+        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'],
-              },
+              matchExpressions: [
+                {
+                  key: "deployed-name",
+                  operator: "In",
+                  values: [
+                    @data['deployed_name']
+                  ]
+                },
+                {
+                  key: "deployment-unique-id",
+                  operator: "In",
+                  values: [
+                    StyledYAML.double_quoted(deploy_unique_id)
+                  ]
+                }
+              ]
             },
           }
 
@@ -207,14 +271,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 {}
@@ -264,6 +328,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),
               "tags.datadoghq.com/env": @data['env'],
               "tags.datadoghq.com/service": @data['deployed_name'],
               "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
@@ -291,6 +356,7 @@ module Pfab
                   application: @data['application'],
                   "deployed-name" => @data['deployed_name'],
                   "application-type" => "web",
+                  "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'])

data/lib/pfab/version.rb

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

data/lib/pfab/yamls.rb

@@ -2,7 +2,7 @@ require 'pry'
 module Pfab
   class Yamls
 
-    def initialize(apps:, application_yaml:, image_name:, env:, sha:, config:)
+    def initialize(apps:, application_yaml:, image_name:, env:, sha:, config:, application_yaml_hash:)
       @apps = apps
       namespace = application_yaml.dig(env.to_s, "namespace") || application_yaml["namespace"]
       raise "No namespace founds" unless namespace
@@ -15,6 +15,7 @@ module Pfab
         'application' => application_yaml["name"],
         'application_yaml' => application_yaml,
         'namespace' => namespace,
+        'application_yaml_hash' => application_yaml_hash
       }
     end
 

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.51.0 ruby lib
+# stub: pfab 0.53.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.51.0"
+  s.version = "0.53.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-13"
+  s.date = "2024-05-14"
   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.51.0
+  version: 0.53.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-13 00:00:00.000000000 Z
+date: 2024-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander