metatron 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c91b426279a0fdc0bc7403da99aad467346c6d9eed8ed662ba4224f51e35988
-  data.tar.gz: c9f9915e91f61eea3a78f8e201572f37ee24d74dc477e9678066f0b8225f9911
+  metadata.gz: 677b9ecf8b5a4c678cf17d251ad3fdd916646c5ba4ac249468f19dc095e8642a
+  data.tar.gz: 6a0dc0822303e49d401b6cb015d446a5bfd8ffaa97a9537b1126427864995503
 SHA512:
-  metadata.gz: 2a3c97156c6dbd3aa2e368639825434be822d90a9bab663dfc8b19fee68fe45e2565ebc762c16381d5c3faeb1a4df91153d1e13302ffe9a18a9bcb1673b22067
-  data.tar.gz: dd31a78a1b92dcae20582921b33b0befc3560c43203b339f68617d736dc98cc358c4b4c8474d6f73f632eb1699857eba674ab578ede827bd6580ff8ca2478b5f
+  metadata.gz: de59bb3b607c464110887c24924876ad58bf025f3aa9462f1fda4a9e312c8a7c4b8aa0243bb8dafdc37dda66f866f58ed27c025944fda6d2049fce502255e0e0
+  data.tar.gz: f7913c719a841d6085aeeb3188d57e8bb4da7d8e6cd60fb73ab496a3929b40c0c5021d8723ae4beffa7df27ba1b71601ff16d2339c5976854147ccb2e9348214

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metatron (0.2.2)
+    metatron (0.2.3)
       json (~> 2.6)
       puma (~> 6.3)
       sinatra (~> 2.2)

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

@@ -5,36 +5,79 @@ module Metatron
     module Concerns
       # A mixin to assist with templating Kubernetes resources that create Pods
       module PodProducer
-        def self.included(base)
+        def self.included(base) # rubocop:disable Metrics/MethodLength
           # base.extend ClassMethods
           base.class_eval do
-            attr_accessor :additional_labels, :additional_pod_labels,
-                          :security_context, :volumes, :containers, :init_containers,
-                          :affinity, :termination_grace_period_seconds,
-                          :tolerations, :pod_annotations, :persistent_volume_claims
+            attr_accessor :active_deadline_seconds, :additional_labels, :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,
+                          :node_name, :persistent_volume_claims, :pod_annotations, :restart_policy,
+                          :scheduler_name, :security_context, :service_account,
+                          :service_account_name, :share_process_namespace, :subdomain,
+                          :termination_grace_period_seconds, :tolerations, :volumes
 
             initializer :pod_producer_initialize
 
+            alias_method :activeDeadlineSeconds, :active_deadline_seconds
+            alias_method :automountServiceAccountToken, :automount_service_account_token
+            alias_method :dnsPolicy, :dns_policy
+            alias_method :enableServiceLinks, :enable_service_links
+            alias_method :hostIPC, :host_ipc
+            alias_method :hostNetwork, :host_network
+            alias_method :hostPID, :host_pid
+            alias_method :nodeSelector, :node_selector
+            alias_method :nodeName, :node_name
+            alias_method :restartPolicy, :restart_policy
+            alias_method :schedulerName, :scheduler_name
             alias_method :securityContext, :security_context
+            alias_method :serviceAccount, :service_account
+            alias_method :serviceAccountName, :service_account_name
+            alias_method :shareProcessNamespace, :share_process_namespace
             alias_method :terminationGracePeriodSeconds, :termination_grace_period_seconds
           end
         end
 
         def pod_producer_initialize
+          @additional_labels = {}
+          @additional_pod_labels = {}
           @affinity = {}
-          @volumes = []
-          @security_context = {}
           @containers = []
+          @enable_service_links = nil
+          @image_pull_secrets = []
           @init_containers = []
-          @additional_labels = {}
-          @additional_pod_labels = {}
+          @node_selector = {}
+          @persistent_volume_claims = []
           @pod_annotations = {}
+          @restart_policy = nil
+          @security_context = {}
           @termination_grace_period_seconds = nil
           @tolerations = []
-          @persistent_volume_claims = []
+          @volumes = []
         end
 
         def formatted_affinity = affinity && !affinity.empty? ? { affinity: } : {}
+        def formatted_containers = { containers: containers.map(&:render) }
+
+        def formatted_image_pull_secrets
+          if image_pull_secrets&.any?
+            { imagePullSecrets: image_pull_secrets.map { _1.is_a?(String) ? { name: _1 } : _1 } }
+          else
+            {}
+          end
+        end
+
+        def formatted_init_containers
+          if init_containers&.any?
+            { initContainers: init_containers.map(&:render) }
+          else
+            {}
+          end
+        end
+
+        def formatted_node_selector
+          node_selector && !node_selector.empty? ? { nodeSelector: } : {}
+        end
 
         def formatted_pod_annotations
           pod_annotations && !pod_annotations.empty? ? { annotations: pod_annotations } : {}
@@ -58,6 +101,55 @@ module Metatron
             {}
           end
         end
+
+        def pod_metadata
+          {
+            metadata: {
+              labels: { "#{label_namespace}/name": name }.merge(additional_pod_labels)
+            }.merge(formatted_pod_annotations)
+          }
+        end
+
+        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Metrics/MethodLength
+        def pod_spec
+          {
+            spec: {
+              activeDeadlineSeconds:,
+              automountServiceAccountToken:,
+              dnsPolicy:,
+              enableServiceLinks:,
+              hostIPC:,
+              hostNetwork:,
+              hostPID:,
+              hostname:,
+              nodeName:,
+              restartPolicy:,
+              schedulerName:,
+              serviceAccount:,
+              serviceAccountName:,
+              shareProcessNamespace:,
+              subdomain:,
+              terminationGracePeriodSeconds:
+            }.merge(formatted_volumes)
+              .merge(formatted_affinity)
+              .merge(formatted_tolerations)
+              .merge(formatted_security_context)
+              .merge(formatted_containers)
+              .merge(formatted_init_containers)
+              .merge(formatted_image_pull_secrets)
+              .merge(formatted_node_selector)
+              .compact
+          }.compact
+        end
+        # rubocop:enable Metrics/AbcSize
+        # rubocop:enable Metrics/MethodLength
+
+        def pod_template
+          {
+            template: {}.merge(pod_metadata).merge(pod_spec).compact
+          }
+        end
       end
     end
   end

data/lib/metatron/templates/cron_job.rb

@@ -10,19 +10,10 @@ module Metatron
 
       attr_accessor :schedule, :suspend, :concurrency_policy, :starting_deadline_seconds,
                     :successful_jobs_history_limit, :failed_jobs_history_limit,
-                    :automount_service_account_token, :backoff_limit, :active_deadline_seconds,
-                    :dns_policy, :restart_policy,
-                    :scheduler_name, :service_account, :service_account_name
+                    :backoff_limit
 
-      alias automountServiceAccountToken automount_service_account_token
       alias backoffLimit backoff_limit
-      alias activeDeadlineSeconds active_deadline_seconds
       alias concurrencyPolicy concurrency_policy
-      alias dnsPolicy dns_policy
-      alias restartPolicy restart_policy
-      alias schedulerName scheduler_name
-      alias serviceAccount service_account
-      alias serviceAccountName service_account_name
       alias startingDeadlineSeconds starting_deadline_seconds
       alias successfulJobsHistoryLimit successful_jobs_history_limit
       alias failedJobsHistoryLimit failed_jobs_history_limit
@@ -31,11 +22,9 @@ module Metatron
         super(name)
         @schedule = schedule
         @api_version = "batch/v1"
-        @restart_policy = "OnFailure"
       end
 
       # rubocop:disable Metrics/AbcSize
-      # rubocop:disable Metrics/MethodLength
       def render
         {
           apiVersion:,
@@ -54,30 +43,13 @@ module Metatron
             jobTemplate: {
               spec: {
                 activeDeadlineSeconds:,
-                backoffLimit:,
-                template: {
-                  spec: {
-                    automountServiceAccountToken:,
-                    terminationGracePeriodSeconds:,
-                    dnsPolicy:,
-                    restartPolicy:,
-                    schedulerName:,
-                    serviceAccount:,
-                    serviceAccountName:,
-                    containers: containers.map(&:render),
-                    init_containers: init_containers.any? ? init_containers.map(&:render) : nil
-                  }.merge(formatted_volumes)
-                    .merge(formatted_security_context)
-                    .compact
-                }.compact
-              }.compact
-            }.merge(formatted_tolerations)
-              .compact
+                backoffLimit:
+              }.merge(pod_template).compact
+            }.merge(formatted_tolerations).compact
           }.compact
         }
       end
       # rubocop:enable Metrics/AbcSize
-      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/metatron/templates/daemon_set.rb

@@ -15,8 +15,6 @@ module Metatron
         @api_version = "apps/v1"
       end
 
-      # rubocop:disable Metrics/AbcSize
-      # rubocop:disable Metrics/MethodLength
       def render
         {
           apiVersion:,
@@ -28,25 +26,10 @@ module Metatron
           spec: {
             selector: {
               matchLabels: { "#{label_namespace}/name": name }.merge(additional_pod_labels)
-            },
-            template: {
-              metadata: {
-                labels: { "#{label_namespace}/name": name }.merge(additional_pod_labels)
-              }.merge(formatted_pod_annotations),
-              spec: {
-                terminationGracePeriodSeconds:,
-                containers: containers.map(&:render),
-                init_containers: init_containers.any? ? init_containers.map(&:render) : nil
-              }.merge(formatted_volumes)
-                .merge(formatted_security_context)
-                .merge(formatted_tolerations)
-                .compact
             }
-          }
+          }.merge(pod_template)
         }
       end
-      # rubocop:enable Metrics/AbcSize
-      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/metatron/templates/deployment.rb

@@ -16,8 +16,6 @@ module Metatron
         @replicas = replicas
       end
 
-      # rubocop:disable Metrics/MethodLength
-      # rubocop:disable Metrics/AbcSize
       def render
         {
           apiVersion:,
@@ -31,25 +29,10 @@ module Metatron
             strategy: { type: "RollingUpdate", rollingUpdate: { maxSurge: 2, maxUnavailable: 0 } },
             selector: {
               matchLabels: { "#{label_namespace}/name": name }.merge(additional_pod_labels)
-            },
-            template: {
-              metadata: {
-                labels: { "#{label_namespace}/name": name }.merge(additional_pod_labels)
-              }.merge(formatted_pod_annotations).merge(formatted_namespace),
-              spec: {
-                terminationGracePeriodSeconds:,
-                containers: containers.map(&:render),
-                init_containers: init_containers.any? ? init_containers.map(&:render) : nil
-              }.merge(formatted_volumes)
-                .merge(formatted_security_context)
-                .merge(formatted_tolerations)
-                .compact
             }
-          }
+          }.merge(pod_template)
         }
       end
-      # rubocop:enable Metrics/AbcSize
-      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/metatron/templates/job.rb

@@ -23,8 +23,6 @@ module Metatron
         @api_version = "batch/v1"
       end
 
-      # rubocop:disable Metrics/AbcSize
-      # rubocop:disable Metrics/MethodLength
       def render
         {
           apiVersion:,
@@ -40,23 +38,10 @@ module Metatron
             completions:,
             parallelism:,
             podFailurePolicy:,
-            ttlSecondsAfterFinished:,
-            template: {
-              spec: {
-                terminationGracePeriodSeconds:,
-                restartPolicy:,
-                containers: containers.map(&:render),
-                init_containers: init_containers.any? ? init_containers.map(&:render) : nil
-              }.merge(formatted_volumes)
-                .merge(formatted_security_context)
-                .merge(formatted_tolerations)
-                .compact
-            }.compact
-          }.compact
+            ttlSecondsAfterFinished:
+          }.merge(pod_template).compact
         }
       end
-      # rubocop:enable Metrics/AbcSize
-      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/metatron/templates/pod.rb

@@ -8,7 +8,6 @@ module Metatron
       include Concerns::PodProducer
       include Concerns::Namespaced
 
-      # rubocop:disable Metrics/AbcSize
       def render
         {
           apiVersion:,
@@ -16,18 +15,9 @@ module Metatron
           metadata: {
             labels: { "#{label_namespace}/name": name }.merge(additional_labels),
             name:
-          }.merge(formatted_annotations).merge(formatted_namespace),
-          spec: {
-            terminationGracePeriodSeconds:,
-            containers: containers.map(&:render),
-            init_containers: init_containers.any? ? init_containers.map(&:render) : nil
-          }.merge(formatted_volumes)
-            .merge(formatted_security_context)
-            .merge(formatted_tolerations)
-            .compact
-        }
+          }.merge(formatted_annotations).merge(formatted_namespace)
+        }.merge(pod_spec)
       end
-      # rubocop:enable Metrics/AbcSize
     end
   end
 end

data/lib/metatron/templates/replica_set.rb

@@ -16,8 +16,6 @@ module Metatron
         @replicas = replicas
       end
 
-      # rubocop:disable Metrics/MethodLength
-      # rubocop:disable Metrics/AbcSize
       def render
         {
           apiVersion:,
@@ -30,25 +28,10 @@ module Metatron
             replicas:,
             selector: {
               matchLabels: { "#{label_namespace}/name": name }.merge(additional_pod_labels)
-            },
-            template: {
-              metadata: {
-                labels: { "#{label_namespace}/name": name }.merge(additional_pod_labels)
-              }.merge(formatted_pod_annotations),
-              spec: {
-                terminationGracePeriodSeconds:,
-                containers: containers.map(&:render),
-                init_containers: init_containers.any? ? init_containers.map(&:render) : nil
-              }.merge(formatted_volumes)
-                .merge(formatted_security_context)
-                .merge(formatted_tolerations)
-                .compact
             }
-          }
+          }.merge(pod_template)
         }
       end
-      # rubocop:enable Metrics/AbcSize
-      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/metatron/templates/stateful_set.rb

@@ -8,14 +8,13 @@ module Metatron
       include Concerns::PodProducer
       include Concerns::Namespaced
 
-      attr_accessor :replicas, :service_name, :pod_management_policy, :enable_service_links
+      attr_accessor :replicas, :service_name, :pod_management_policy
 
       def initialize(name, replicas: 1)
         super(name)
         @replicas = replicas
         @api_version = "apps/v1"
         @pod_management_policy = "OrderedReady"
-        @enable_service_links = true
         @service_name = name
       end
 
@@ -23,8 +22,6 @@ module Metatron
       alias podManagementPolicy pod_management_policy
       alias serviceName service_name
 
-      # rubocop:disable Metrics/MethodLength
-      # rubocop:disable Metrics/AbcSize
       def render
         {
           apiVersion:,
@@ -36,29 +33,13 @@ module Metatron
           spec: {
             replicas:,
             serviceName:,
-            enableServiceLinks:,
             strategy: { type: "RollingUpdate", rollingUpdate: { maxSurge: 2, maxUnavailable: 0 } },
             selector: {
               matchLabels: { "#{label_namespace}/name": name }.merge(additional_pod_labels)
-            },
-            template: {
-              metadata: {
-                labels: { "#{label_namespace}/name": name }.merge(additional_pod_labels)
-              }.merge(formatted_pod_annotations),
-              spec: {
-                terminationGracePeriodSeconds:,
-                containers: containers.map(&:render),
-                init_containers: init_containers.any? ? init_containers.map(&:render) : nil
-              }.merge(formatted_volumes)
-                .merge(formatted_affinity)
-                .merge(formatted_tolerations)
-                .compact
             }
-          }
+          }.merge(pod_template)
         }.merge(volume_claim_templates)
       end
-      # rubocop:enable Metrics/AbcSize
-      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/metatron/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metatron
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-28 00:00:00.000000000 Z
+date: 2023-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json