pfab 0.58.23 → 0.59.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f1f5eda82b8146e9678f448de6fcd73e1d3eff2beae589631526054fbe8391c
-  data.tar.gz: 97e88c622c126fd5607f77bbe0a73a08914ab3a91c516a75e5ebbc5d66be05b6
+  metadata.gz: 15668736ef7c25f6740964b891ed462e9525438cad02ac4a31f6675fa8a86d8a
+  data.tar.gz: cd649c6f885dff4abd50e56c14c20ec7541909e7938abcaf99eefdd46871d5dd
 SHA512:
-  metadata.gz: 210e31b7c555d3703e73d25d236d9d616cbf6fbc0b7a397b3fdd62a32fc0d3cf9cbe00458ab0b35ce75b38713ef5a0ec9ca22a9146732795c8dea82bc5e04dba
-  data.tar.gz: a2c6ee508f2dda1e8a0126f221813e8bff0f5f53a893aee748f5d9fbd97badee9df7feb71e3a84aae235b6467e771fb82e2495948fdf7acc67a00a375081ad65
+  metadata.gz: be5e0fc796dee5c98edf48277cc6869c7897e384b1a762743ac8c3845e9988f24d54596d5de64da2dac053c1ab221c83421bab5f6e8d51c43052ae63922e5273
+  data.tar.gz: d1c8b6dd4acf30cacd32704f37076da3fc1190be000b08d1718cc02306c1b3d784819ac9a9547393ee015033346c3bbbae99a16cbf08bb9565fbdf667d3fbf6b

data/lib/pfab/templates/base.rb

@@ -26,9 +26,9 @@ module Pfab
       def get_command()
         cmd = get("command")
         if cmd.kind_of?(Array)
-          return cmd
+          return clean_command_array(cmd)
         end
-        return cmd.split(" ")
+        return clean_command_array(cmd.split(" "))
       end
 
       def cpu(req_type)
@@ -164,6 +164,156 @@ module Pfab
         return ports
       end
 
+      def sidecars
+        get("sidecars") || []
+      end
+
+      def build_sidecar_resources(sidecar)
+        return nil unless sidecar["resources"]
+
+        resources = {}
+        if sidecar["resources"]["requests"]
+          resources[:requests] = {}
+          resources[:requests][:cpu] = sidecar["resources"]["requests"]["cpu"] if sidecar["resources"]["requests"]["cpu"]
+          resources[:requests][:memory] = sidecar["resources"]["requests"]["memory"] if sidecar["resources"]["requests"]["memory"]
+        end
+        if sidecar["resources"]["limits"]
+          resources[:limits] = {}
+          resources[:limits][:cpu] = sidecar["resources"]["limits"]["cpu"] if sidecar["resources"]["limits"]["cpu"]
+          resources[:limits][:memory] = sidecar["resources"]["limits"]["memory"] if sidecar["resources"]["limits"]["memory"]
+        end
+
+        resources.empty? ? nil : resources
+      end
+
+      def build_sidecar_env(sidecar)
+        # Start with base environment variables that all containers get
+        base_env = env_vars.dup
+
+        # If sidecar has additional env vars, merge them in (allowing overrides)
+        if sidecar["env"]
+          sidecar_env = sidecar["env"].map do |env_var|
+            if env_var.is_a?(Hash)
+              env_var.transform_keys(&:to_sym)
+            elsif env_var.is_a?(String)
+              # Handle simple string format like "KEY=value" or just "KEY"
+              if env_var.include?("=")
+                key, value = env_var.split("=", 2)
+                { name: key, value: value }
+              else
+                { name: env_var }
+              end
+            end
+          end.compact
+
+          # Merge sidecar env vars, allowing them to override base vars
+          env_hash = {}
+          base_env.each { |e| env_hash[e[:name]] = e }
+          sidecar_env.each { |e| env_hash[e[:name]] = e }
+          env_hash.values
+        else
+          base_env
+        end
+      end
+
+      def build_sidecar_ports(sidecar)
+        return nil unless sidecar["ports"]
+
+        sidecar["ports"].map do |port|
+          if port.is_a?(Hash)
+            result = {}
+            result[:name] = port["name"] if port["name"]
+            result[:containerPort] = port["containerPort"] if port["containerPort"]
+            result[:protocol] = port["protocol"] if port["protocol"]
+            result
+          elsif port.is_a?(Integer)
+            { containerPort: port }
+          end
+        end.compact
+      end
+
+      def build_sidecar_volume_mounts(sidecar)
+        return nil unless sidecar["volumeMounts"]
+
+        sidecar["volumeMounts"].map do |mount|
+          result = {}
+          result[:name] = mount["name"] if mount["name"]
+          result[:mountPath] = mount["mountPath"] if mount["mountPath"]
+          result[:readOnly] = mount["readOnly"] if mount.key?("readOnly")
+          result[:subPath] = mount["subPath"] if mount["subPath"]
+          result
+        end
+      end
+
+      def build_env_hash_for_expansion
+        # Build hash of all environment variables with same precedence as env_vars
+        env_hash = {}
+
+        # Load in order of precedence (later values override earlier)
+        [
+          @data.dig("application_yaml", :environment),
+          @data.dig("application_yaml", @data["env"], :environment),
+          app_vars[:environment],
+          app_vars.dig(@data["env"], :environment)
+        ].each do |env_vars|
+          next unless env_vars
+          env_vars.each do |key, value|
+            # Skip special field/ and configmap/ references
+            unless value.to_s.start_with?("field/", "configmap/")
+              env_hash[key.to_s] = value.to_s
+            end
+          end
+        end
+
+        env_hash
+      end
+
+      def expand_variables(str)
+        return str unless str.is_a?(String)
+
+        env_hash = build_env_hash_for_expansion
+
+        # Support both $(VAR) and ${VAR} syntax
+        str.gsub(/\$\{([^}]+)\}|\$\(([^)]+)\)/) do
+          var_name = $1 || $2
+          env_hash[var_name] || "$#{$1 ? "{#{var_name}}" : "(#{var_name})"}"
+        end
+      end
+
+      def clean_command_array(array)
+        return nil unless array
+
+        array.map do |item|
+          if item.is_a?(String)
+            expand_variables(item.strip)
+          else
+            item
+          end
+        end
+      end
+
+      def sidecar_containers
+        sidecars.map do |sidecar|
+          container = {
+            name: sidecar["name"],
+            image: sidecar["image"],
+            restartPolicy: "Always"  # Native sidecar support (K8s 1.28+)
+          }
+
+          container[:command] = clean_command_array(sidecar["command"])
+          container[:args] = clean_command_array(sidecar["args"])
+          container[:env] = build_sidecar_env(sidecar)
+          container[:envFrom] = env_from  # Inherit ConfigMap/Secret references
+          container[:resources] = build_sidecar_resources(sidecar)
+          container[:ports] = build_sidecar_ports(sidecar)
+          container[:volumeMounts] = build_sidecar_volume_mounts(sidecar)
+          container[:imagePullPolicy] = sidecar["imagePullPolicy"] if sidecar["imagePullPolicy"]
+          container[:securityContext] = sidecar["securityContext"].transform_keys(&:to_sym) if sidecar["securityContext"]
+
+          container.compact
+        end
+      end
+
       def base_labels
         {
           application: @data['application'],

data/lib/pfab/templates/cron.rb

@@ -36,6 +36,7 @@ module Pfab
                   },
                   spec: {
                     serviceAccountName: get('serviceAccountName'),
+                    initContainers: sidecar_containers.empty? ? nil : sidecar_containers,
                     containers: [
                       {
                         image: image_name,

data/lib/pfab/templates/daemon.rb

@@ -33,6 +33,7 @@ module Pfab
               },
               spec: {
                 serviceAccountName: get('serviceAccountName'),
+                initContainers: sidecar_containers.empty? ? nil : sidecar_containers,
                 containers: [
                   {
                     image: image_name,

data/lib/pfab/templates/job.rb

@@ -30,6 +30,7 @@ module Pfab
               },
               spec: {
                 serviceAccountName: get('serviceAccountName'),
+                initContainers: sidecar_containers.empty? ? nil : sidecar_containers,
                 containers: [
                   {
                     image: image_name,

data/lib/pfab/templates/web.rb

@@ -282,6 +282,7 @@ module Pfab
               spec: {
                 serviceAccountName: get('serviceAccountName'),
                 terminationGracePeriodSeconds: get("terminationGracePeriodSeconds") || 30,
+                initContainers: sidecar_containers.empty? ? nil : sidecar_containers,
                 containers: [
                   {
                     image: image_name,

data/lib/pfab/version.rb

@@ -1,8 +1,8 @@
 module Pfab
   module Version
     MAJOR = 0
-    MINOR = 58
-    PATCH = 23
+    MINOR = 59
+    PATCH = 0
     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.58.23 ruby lib
+# stub: pfab 0.59.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.58.23".freeze
+  s.version = "0.59.0".freeze
 
   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 = "2025-09-08"
+  s.date = "2025-10-28"
   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.58.23
+  version: 0.59.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-09 00:00:00.000000000 Z
+date: 2025-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander