pfab 0.50.0 → 0.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 843d834bac5fcac5a8761c3571769bdfddfbe675b437c053c73f51ac5de2be5e
-  data.tar.gz: 71d5523cf8f3fbdd3ac10775f16b75c25b36d427bce36d86f078a36c7d39b9b6
+  metadata.gz: e19f6543864483d014f040e4d0ba5c2e8322bb20ca5604f351c13a36f53b20cd
+  data.tar.gz: 1d1afb9c39e0e6d69f5849bd171e2a659174ec747c601239c6e9cc051da92d6f
 SHA512:
-  metadata.gz: 7154a5cf912a6f890f4b4442942655a06a9d37dbcb1c53d0d0db55c1f752048ce5d47663e4b00ae79f0bcd4fe7dac4c744a086c91974337a672f2f89c49c1518
-  data.tar.gz: b31ca987ad5f375d4f9d24ce253c42455a6d8ec8da2592885496d8f3066baef1f220c5dabdad7175f6b55ec0d3ae43be6ce5d359059d1ba5affa004cdd209fbd
+  metadata.gz: c402604e6fd169342b2aff975ecb79b15b59cf67399c91a57c15597df3b7629d0a0eb84c5df14e784c09ca4612fafdad60e620bae52a76f1da269030c05d9fa4
+  data.tar.gz: 569c405d1a4be90a456ef7dbb8f5e3cadf842b475644dbb79e85fc6d2765dc557e75b147dba2c58ae88c67ef37d0cab5f45bf9c000983ccb69535597c1a42d40

data/lib/pfab/cli.rb

@@ -106,18 +106,20 @@ module Pfab
 
       command :exec do |c|
         c.option "-c", "--command command", "use with exec to run a command and exit. default is /bin/sh"
-        c.syntax = "pfab exec"
+        c.syntax = "pfab exec [-- command to execute]'"
         c.summary = "kubectl exec into a  pod"
         c.description = "CLI to the Cloud"
         c.example "exec into the first pod in staging",
-                  "pfab exec"
+                  "pfab -e staging exec"
         c.example "exec into the first pod in production",
-                  "ezp -p exec"
+                  "pfab -p exec"
         c.action do |args, options|
           set_kube_context
+          # Access the command line input after "--"
+          additional_args = ARGV[ARGV.index('--') + 1..-1] if ARGV.include?('--')
           app_name = get_app_name
           first_pod = get_first_pod app_name
-          kubectl "exec -it #{first_pod}", "-- #{options.command || '/bin/sh'}"
+          kubectl "exec -it #{first_pod}", "-- #{additional_args.join(" ") || options.command || '/bin/sh'}"
         end
       end
 

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