metatron 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef9aac429ebb8074709e762051f6b5b54b58fa509c05c221383275ede14b1250
-  data.tar.gz: b367fcc93d32010eb00f9b642b8e8651b329b4f0e15f44d0c25b0fe6b13f305c
+  metadata.gz: 36e8e6c44406c821d01c13c564acf765719ac6ac2572053afa5d4bd5b33df33f
+  data.tar.gz: 3378c577112bdc28cfbdf4e33c6a5a739434ba4e38312a4147f574ca09b29139
 SHA512:
-  metadata.gz: 38531090c45a8417780e07118c7f52d579e074d718e781651a61e2c894cdfee23ab900f33b3f6ac5d2ab578ee1d03b6fdde40a785a3eb7533c473330ef7af17f
-  data.tar.gz: 2a4f9d9ec0926f510cc5f2033d47f1514dafa4b828d7ecec07b776131132ffcc7e88b3802fa75e06d427c56402569edf5d669318aa7d50c9921dd5a37d358bdc
+  metadata.gz: a3857663d6044c885a46e1ff3bf5017281f4202273516bacb7a38e1aaa9cd84d689221c700fb4d4f55316f3b55eec379134eae12ba9d7727e233f051b9da9bb7
+  data.tar.gz: dddb6a6dda8d5a54b44c14cc2579f570e099033e22b085a560827ca60344b2d8d3ef331cd9660526c358e3c80ed2c9f2dba309b8707b44f29f75e1b365854809

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metatron (0.2.5)
+    metatron (0.2.7)
       json (~> 2.6)
       puma (~> 6.3)
       sinatra (~> 2.2)
@@ -39,7 +39,7 @@ GEM
     puma (6.3.0)
       nio4r (~> 2.0)
     racc (1.7.1)
-    rack (2.2.7)
+    rack (2.2.8)
     rack-protection (2.2.4)
       rack
     rack-test (2.1.0)
@@ -64,7 +64,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
-    rubocop (1.55.0)
+    rubocop (1.55.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -83,7 +83,7 @@ GEM
       rubocop (~> 1.33)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.22.0)
+    rubocop-rspec (2.23.0)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)

data/lib/metatron/template.rb

@@ -3,7 +3,7 @@
 module Metatron
   # Base class for templating Kubernetes resources
   class Template
-    attr_accessor :api_version, :name
+    attr_accessor :api_version, :name, :additional_labels
     attr_reader :kind, :label_namespace
 
     class << self
@@ -19,6 +19,7 @@ module Metatron
       @label_namespace = self.class.label_namespace
       @api_version = "v1"
       @kind = find_kind
+      @additional_labels = {}
       run_initializers
     end
 

data/lib/metatron/templates/concerns/pod_producer.rb

@@ -8,7 +8,7 @@ module Metatron
         def self.included(base) # rubocop:disable Metrics/MethodLength
           # base.extend ClassMethods
           base.class_eval do
-            attr_accessor :active_deadline_seconds, :additional_labels, :additional_pod_labels,
+            attr_accessor :active_deadline_seconds, :additional_pod_labels,
                           :affinity, :automount_service_account_token, :containers,
                           :dns_policy, :enable_service_links, :hostname, :host_ipc, :host_network,
                           :host_pid, :image_pull_secrets, :init_containers, :node_selector,
@@ -39,7 +39,6 @@ module Metatron
         end
 
         def pod_producer_initialize
-          @additional_labels = {}
           @additional_pod_labels = {}
           @affinity = {}
           @containers = []

data/lib/metatron/templates/container.rb

@@ -5,7 +5,7 @@ module Metatron
     # Template for containers used by k8s resources (not an actual resource)
     class Container
       attr_accessor :name, :image, :command, :args, :env, :envfrom, :resources, :volume_mounts,
-                    :image_pull_policy, :life_cycle, :probes, :security_context, :ports,
+                    :image_pull_policy, :lifecycle, :probes, :security_context, :ports,
                     :stdin, :tty
 
       alias imagePullPolicy image_pull_policy
@@ -23,15 +23,16 @@ module Metatron
         @resources = {}
         @volume_mounts = []
         @image_pull_policy = "IfNotPresent"
-        @life_cycle = {}
+        @lifecycle = {}
         @probes = {}
         @stdin = true
         @tty = true
       end
 
-      def render
+      def render # rubocop:disable Metrics/AbcSize
         {
           name:,
+          command:,
           image:,
           imagePullPolicy:,
           stdin:,
@@ -43,9 +44,23 @@ module Metatron
           .merge(formatted_ports)
           .merge(formatted_volume_mounts)
           .merge(formatted_security_context)
+          .merge(formatted_args)
+          .merge(formatted_lifecycle)
           .compact
       end
 
+      def formatted_args
+        return {} unless args && !args.empty?
+
+        { args: }
+      end
+
+      def formatted_lifecycle
+        return {} unless lifecycle && !lifecycle.empty?
+
+        { lifecycle: }
+      end
+
       def formatted_environment # rubocop:disable Metrics/PerceivedComplexity
         return {} unless env && !env.empty?
 

data/lib/metatron/templates/service_account.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Metatron
+  module Templates
+    # The ServiceAccount Kubernetes resource
+    class ServiceAccount < Template
+      include Concerns::Annotated
+      include Concerns::Namespaced
+
+      attr_accessor :automount_service_account_token
+
+      alias automountServiceAccountToken automount_service_account_token
+
+      def render
+        {
+          apiVersion:,
+          kind:,
+          automountServiceAccountToken:,
+          metadata: {
+            name:,
+            labels: { "#{label_namespace}/name": name }.merge(additional_labels)
+          }.merge(formatted_annotations).merge(formatted_namespace).compact
+        }.compact
+      end
+    end
+  end
+end

data/lib/metatron/version.rb

@@ -4,6 +4,6 @@ module Metatron
   VERSION = [
     0, # major
     2, # minor
-    5  # patch
+    7  # patch
   ].join(".")
 end

data/lib/metatron.rb

@@ -40,6 +40,7 @@ require "metatron/templates/replica_set"
 require "metatron/templates/config_map"
 require "metatron/templates/secret"
 require "metatron/templates/service"
+require "metatron/templates/service_account"
 require "metatron/templates/stateful_set"
 require "metatron/controller"
 require "metatron/sync_controller"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metatron
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-01 00:00:00.000000000 Z
+date: 2023-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -272,6 +272,7 @@ files:
 - lib/metatron/templates/replica_set.rb
 - lib/metatron/templates/secret.rb
 - lib/metatron/templates/service.rb
+- lib/metatron/templates/service_account.rb
 - lib/metatron/templates/stateful_set.rb
 - lib/metatron/version.rb
 - metatron.gemspec