pfab 0.48.0 → 0.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1f48c3d9fcd1452e69dd15582ee9ba820e059c3af739b95798026ae36e1a0d0
-  data.tar.gz: daee2b61dcb71d13ecfbcd9f3b5440dd5b7e2aca4a7a6226ecd7209956b30570
+  metadata.gz: 843d834bac5fcac5a8761c3571769bdfddfbe675b437c053c73f51ac5de2be5e
+  data.tar.gz: 71d5523cf8f3fbdd3ac10775f16b75c25b36d427bce36d86f078a36c7d39b9b6
 SHA512:
-  metadata.gz: 64e704e41017b4c5eb47846d6444149c08124549d2b57d76c42ce6fb5e4bcb40fc08ce7d4b4b17335e9fc05a78ca3d4262823aba723e340b138eb276683026ce
-  data.tar.gz: 9b5a22ccab3a869754c78b3458087e4a47007a5a69a3fc023b884f355765fe2a5de154b49bd2799672210dc5777aae8dc8d52a3ba236bda0a83cb545af0ced1a
+  metadata.gz: 7154a5cf912a6f890f4b4442942655a06a9d37dbcb1c53d0d0db55c1f752048ce5d47663e4b00ae79f0bcd4fe7dac4c744a086c91974337a672f2f89c49c1518
+  data.tar.gz: b31ca987ad5f375d4f9d24ce253c42455a6d8ec8da2592885496d8f3066baef1f220c5dabdad7175f6b55ec0d3ae43be6ce5d359059d1ba5affa004cdd209fbd

data/lib/pfab/templates/base.rb

@@ -125,6 +125,28 @@ module Pfab
             } }
         end
       end
+
+
+      def container_ports
+        ports = []
+        if app_vars["port"]
+          ports.append ({
+            name: "main",
+            containerPort: app_vars["port"]
+          })
+        end
+        %w[additionalPorts containerPorts].each do |key|
+          if get(key)
+            get(key).each do |name, number|
+              ports.append(
+                {name: name, containerPort: number}
+              )
+            end
+          end
+        end
+
+        return ports
+      end
     end
   end
 end

data/lib/pfab/templates/daemon.rb

@@ -58,6 +58,7 @@ module Pfab
                     env: env_vars,
                     envFrom: env_from,
                     resources: resources,
+                    ports: container_ports()
                   }
                 ]
               }.compact,

data/lib/pfab/templates/web.rb

@@ -14,6 +14,7 @@ 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)
         end
       end
 
@@ -155,6 +156,70 @@ module Pfab
         "web"
       end
 
+      def pod_disruption_budget
+        pdb = {
+          apiVersion: "policy/v1",
+          kind: "PodDisruptionBudget",
+          metadata:  {
+            name: "#{@data['deployed_name']}-pdb",
+            namespace: get_namespace()
+          },
+          spec: {
+            minAvailable: 1,
+            selector: {
+            matchLabels: {
+              application: @data['application'],
+              "deployed-name" => @data['deployed_name'],
+              "application-type" => application_type
+              }
+            }
+          }
+        }
+        return pdb
+      end
+      ANTI_AFFINITY_TYPES = %w[disabled required preferred]
+      ANTI_AFFINITY_MODE = 'antiAffinityMode'
+      ANTI_AFFINITY_PREFERRED_MODE_WEIGHT = 'antiAffinityPreferredModeWeight'
+
+      def anti_affinity
+        if app_vars.has_key?(ANTI_AFFINITY_MODE)
+          antiAffinityMode = app_vars[ANTI_AFFINITY_MODE]
+          affinitySelector = {
+            topologyKey: "kubernetes.io/hostname",
+            labelSelector: {
+              matchLabels: {
+                "deployed-name" => @data['deployed_name'],
+              },
+            },
+          }
+
+          return case antiAffinityMode
+                 when "disabled"
+                   puts "antiAffinityMode is set to disabled, skipping"
+                   {}
+                 when "required"
+                   {
+                     podAntiAffinity: {
+                       requiredDuringSchedulingIgnoredDuringExecution: [
+                         affinitySelector
+                       ] } }
+                 when "preferred"
+                   { podAntiAffinity: {
+                     preferredDuringSchedulingIgnoredDuringExecution: [
+                       {
+                         weight: app_vars[ANTI_AFFINITY_PREFERRED_MODE_WEIGHT] || 100,
+                         podAffinityTerm: affinitySelector
+                       }
+                     ]
+                   }
+                   }
+                 else
+                   raise "Unexpected value #{antiAffinityMode} specified for `#{ANTI_AFFINITY_MODE}`. Valid selections are #{ANTI_AFFINITY_TYPES}"
+                 end
+        end
+        return {}
+      end
+
       def deployment
         secret_mounts = get("secretMounts") || []
         volume_mounts = []
@@ -186,17 +251,7 @@ module Pfab
             readOnly: true
           )
         end
-        ports = [  {
-                     name: "main",
-                     containerPort: app_vars["port"]
-                   }]
-        if get("additionalPorts")
-          get("additionalPorts").each do |name, number|
-            ports.append(
-              {name: name, containerPort: number}
-            )
-          end
-        end
+        ports = container_ports()
 
         {
           kind: "Deployment",
@@ -260,25 +315,12 @@ module Pfab
                     volumeMounts: volume_mounts
                   }.compact
                 ],
-                affinity:  {
-                  podAntiAffinity: {
-                    requiredDuringSchedulingIgnoredDuringExecution: [
-                      {
-                        topologyKey: "kubernetes.io/hostname",
-                        labelSelector: {
-                          matchLabels: {
-                            "deployed-name" => @data['deployed_name'],
-                          },
-                        },
-                      }
-                    ]
-                  }
-                },
+                affinity:  anti_affinity,
                 volumes: volumes
               }.compact,
             },
           }.compact,
-        }
+        }.compact
       end
     end
   end

data/lib/pfab/version.rb

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

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.48.0 ruby lib
+# stub: pfab 0.50.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.48.0"
+  s.version = "0.50.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-02-15"
+  s.date = "2024-05-06"
   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.48.0
+  version: 0.50.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-15 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander