metatron 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9904b986356c64a1f895a522baf591911fdd4bdce61d47d94b8db3a05148b11f
-  data.tar.gz: e5230c29009ef2cbf5c9721fa13ddfc65dad02114dfd4c8fd24e9d6873ae0d47
+  metadata.gz: e2595e703b422eadf0c748386541eae93f9b447d74e2bd70160a85dc14c7f59a
+  data.tar.gz: 599adf4652b4e2bbf35f86f95c083f6e6e03780d44fa563c83ca714c90aa3004
 SHA512:
-  metadata.gz: 3886638f6f20c362c519e1ddf5fa1a5067bc00d038d37586c9fc11c5ff887a7f1518b957ef334ffeabe02cae7938f75732f6ef1f68941c80fe70f66c9bbc5804
-  data.tar.gz: 71b9e8ec7e997d71c4369caef8a6f45d74ee6e9120a01a6d8d5723057dd8c76d954cd879df94365050ae2bcf2786f2415578c32ec8d70eebe23049b79cc3a0d9
+  metadata.gz: fd16efd8685097c4fdb321de668cecb60ac24c0dab98e1e97ab40590007d524dfa9b0ba644174786d659a0fc6bc1225b48b62cb0ae2a1224e1503ee8a6aa40c7
+  data.tar.gz: d0255911256d4e233f300b5a82dbeba91feeba7819d920bdd2e2e3c505a02b1b7343fdfc8ec938912bc4f650491ddfdc51efc007f7e57e58527ecf0665b07adf

data/.rubocop.yml

@@ -38,6 +38,9 @@ Metrics/ClassLength:
 Gemspec/RequireMFA:
   Enabled: false
 
+Gemspec/DevelopmentDependencies:
+  Enabled: false
+
 Style/MixinUsage:
   Exclude:
   - "bin/console"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metatron (0.1.9)
+    metatron (0.2.0)
       json (~> 2.6)
       puma (~> 6.3)
       sinatra (~> 2.2)
@@ -50,7 +50,7 @@ GEM
     regexp_parser (2.8.1)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.2.5)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)

data/README.md

@@ -203,7 +203,7 @@ module BlogController
       #   status = compare_children(request_body["children"], desired_children)
       status = {}
 
-      { status:, children: desired_children.map(&:render) }
+      { status:, children: desired_children }
     end
 
     def construct_app_resources(parent, db_secret)
@@ -235,18 +235,23 @@ module BlogController
 
     def construct_db_stateful_set(secret)
       stateful_set = Metatron::Templates::StatefulSet.new("db")
-      stateful_set.image = "mysql:8.0"
+      container = Metatron::Templates::Container.new("db")
+      container.image = "mysql:8.0"
+      container.envfrom << secret.name
+      stateful_set.containers << container
       stateful_set.additional_pod_labels = { "app.kubernetes.io/component": "db" }
-      stateful_set.envfrom << secret.name
       stateful_set
     end
 
     def construct_app_deployment(meta, spec, auth_secret)
       deployment = Metatron::Templates::Deployment.new(meta["name"], replicas: spec["replicas"])
-      deployment.image = spec["image"]
+      container = Metatron::Templates::Container.new("app")
+      container.image = spec["image"]
+      container.envfrom << auth_secret.name
+      container.ports << { name: "web", containerPort: 3000 }
+
+      deployment.containers << container
       deployment.additional_pod_labels = { "app.kubernetes.io/component": "app" }
-      deployment.envfrom << auth_secret.name
-      deployment.ports << { name: "web", containerPort: 3000 }
       deployment
     end
 

data/lib/metatron/sync_controller.rb

@@ -9,7 +9,9 @@ module Metatron
     end
 
     post "/" do
-      halt(sync.to_json)
+      data = sync
+      data[:children] = data[:children]&.map { |c| c.respond_to?(:render) ? c.render : c }
+      halt(data.to_json)
     end
   end
 end

data/lib/metatron/template.rb

@@ -3,12 +3,20 @@
 module Metatron
   # Base class for templating Kubernetes resources
   class Template
-    attr_accessor :api_version, :label_namespace, :name
-    attr_reader :kind
+    attr_accessor :api_version, :name
+    attr_reader :kind, :label_namespace
+
+    class << self
+      attr_writer :label_namespace
+
+      def label_namespace
+        @label_namespace ||= "metatron.therubyist.org"
+      end
+    end
 
     def initialize(name)
       @name = name
-      @label_namespace = "metatron.therubyist.org"
+      @label_namespace = self.class.label_namespace
       @api_version = "v1"
       @kind = self.class.name.split("::").last
       run_initializers

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

@@ -8,78 +8,42 @@ module Metatron
         def self.included(base)
           # base.extend ClassMethods
           base.class_eval do
-            attr_accessor :image, :image_pull_policy, :additional_labels, :additional_pod_labels,
-                          :resource_limits, :resource_requests, :probes, :ports, :security_context,
-                          :volume_mounts, :volumes, :additional_containers, :env, :envfrom,
-                          :container_security_context, :affinity, :termination_grace_period_seconds,
+            attr_accessor :additional_labels, :additional_pod_labels,
+                          :security_context, :volumes, :containers, :init_containers,
+                          :affinity, :termination_grace_period_seconds,
                           :tolerations, :pod_annotations
 
             initializer :pod_producer_initialize
 
-            alias_method :imagePullPolicy, :image_pull_policy
-            alias_method :volumeMounts, :volume_mounts
             alias_method :securityContext, :security_context
-            alias_method :environment, :env
             alias_method :terminationGracePeriodSeconds, :termination_grace_period_seconds
           end
         end
 
         def pod_producer_initialize
-          @image = "gcr.io/google_containers/pause"
-          @image_pull_policy = "IfNotPresent"
-          @resource_limits = { memory: "512Mi", cpu: "500m" }
-          @resource_requests = { memory: "64Mi", cpu: "10m" }
           @affinity = {}
-          @env = {}
-          @envfrom = []
-          @probes = {}
-          @ports = []
-          @volume_mounts = []
           @volumes = []
           @security_context = {}
-          @container_security_context = {}
-          @additional_containers = []
+          @containers = []
+          @init_containers = []
           @additional_labels = {}
           @additional_pod_labels = {}
           @pod_annotations = {}
-          @termination_grace_period_seconds = 60
+          @termination_grace_period_seconds = nil
           @tolerations = []
         end
 
         def formatted_affinity = affinity && !affinity.empty? ? { affinity: } : {}
 
-        def formatted_environment
-          env && !env.empty? ? { env: env.map { |k, v| { name: k, value: v } } } : {}
-        end
-
-        def formatted_envfrom
-          if envfrom && !envfrom.empty?
-            { envFrom: envfrom.map { |secret| { secretRef: { name: secret } } } }
-          else
-            {}
-          end
-        end
-
         def formatted_pod_annotations
           pod_annotations && !pod_annotations.empty? ? { annotations: pod_annotations } : {}
         end
 
-        def formatted_ports = ports&.any? ? { ports: } : {}
-
         def formatted_security_context
           security_context && !security_context.empty? ? { securityContext: } : {}
         end
 
-        def formatted_container_security_context
-          if container_security_context && !container_security_context.empty?
-            { securityContext: container_security_context }
-          else
-            {}
-          end
-        end
-
         def formatted_tolerations = tolerations&.any? ? { tolerations: } : {}
-        def formatted_volume_mounts = volume_mounts&.any? ? { volumeMounts: } : {}
         def formatted_volumes = volumes&.any? ? { volumes: } : {}
       end
     end

data/lib/metatron/templates/container.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+module Metatron
+  module Templates
+    # 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,
+                    :stdin, :tty
+
+      alias imagePullPolicy image_pull_policy
+      alias volumeMounts volume_mounts
+      alias securityContext security_context
+      alias environment env
+      alias envFrom envfrom
+
+      def initialize(name, image = "gcr.io/google_containers/pause")
+        @name = name
+        @image = image
+        @command = nil
+        @args = []
+        @env = []
+        @resources = {}
+        @volume_mounts = []
+        @image_pull_policy = "IfNotPresent"
+        @life_cycle = {}
+        @probes = {}
+        @stdin = true
+        @tty = true
+      end
+
+      def render
+        {
+          name:,
+          image:,
+          imagePullPolicy:,
+          stdin:,
+          tty:
+        }.merge(probes)
+          .merge(formatted_resources)
+          .merge(formatted_environment)
+          .merge(formatted_envfrom)
+          .merge(formatted_ports)
+          .merge(formatted_volume_mounts)
+          .merge(formatted_security_context)
+          .compact
+      end
+
+      def formatted_environment # rubocop:disable Metrics/PerceivedComplexity
+        return {} unless env && !env.empty?
+
+        if env.is_a?(Hash)
+          mapped_values = env.map do |key, value|
+            v = { name: key }
+            if value.is_a?(Hash)
+              v.merge!(value)
+            else
+              v[:value] = value
+            end
+            v
+          end
+
+          { env: mapped_values }
+        elsif env.is_a?(Array)
+          { env: }
+        else
+          raise "Environment must be a Hash or Array"
+        end
+      end
+
+      def formatted_envfrom
+        if envfrom && !envfrom.empty?
+          { envFrom: envfrom.map { |secret| { secretRef: { name: secret } } } }
+        else
+          {}
+        end
+      end
+
+      def formatted_resources = resources&.any? ? { resources: } : {}
+
+      def formatted_ports = ports&.any? ? { ports: } : {}
+
+      def formatted_security_context
+        security_context && !security_context.empty? ? { securityContext: } : {}
+      end
+
+      def formatted_volume_mounts = volume_mounts&.any? ? { volumeMounts: } : {}
+    end
+  end
+end

data/lib/metatron/templates/cron_job.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+module Metatron
+  module Templates
+    # Template for basic CronJob k8s resource
+    class CronJob < Template
+      include Concerns::Annotated
+      include Concerns::PodProducer
+      include Concerns::Namespaced
+
+      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
+
+      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
+
+      def initialize(name, schedule = "* * * * *")
+        super(name)
+        @schedule = schedule
+        @api_version = "batch/v1"
+        @restart_policy = "OnFailure"
+      end
+
+      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/MethodLength
+      def render
+        {
+          apiVersion:,
+          kind:,
+          metadata: {
+            labels: { "#{label_namespace}/name": name }.merge(additional_labels),
+            name:
+          }.merge(formatted_annotations).merge(formatted_namespace),
+          spec: {
+            schedule:,
+            suspend:,
+            concurrencyPolicy:,
+            startingDeadlineSeconds:,
+            successfulJobsHistoryLimit:,
+            failedJobsHistoryLimit:,
+            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
+          }.compact
+        }
+      end
+      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/MethodLength
+    end
+  end
+end

data/lib/metatron/templates/daemon_set.rb

@@ -15,8 +15,8 @@ module Metatron
         @api_version = "apps/v1"
       end
 
-      # rubocop:disable Metrics/MethodLength
       # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/MethodLength
       def render
         {
           apiVersion:,
@@ -35,24 +35,12 @@ module Metatron
               }.merge(formatted_pod_annotations),
               spec: {
                 terminationGracePeriodSeconds:,
-                containers: [
-                  {
-                    name: "app",
-                    image:,
-                    imagePullPolicy:,
-                    stdin: true,
-                    tty: true,
-                    resources: { limits: resource_limits, requests: resource_requests }
-                  }.merge(probes)
-                    .merge(formatted_environment)
-                    .merge(formatted_envfrom)
-                    .merge(formatted_ports)
-                    .merge(formatted_volume_mounts)
-                    .merge(formatted_container_security_context)
-                ] + additional_containers
+                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
             }
           }
         }

data/lib/metatron/templates/deployment.rb

@@ -38,24 +38,12 @@ module Metatron
               }.merge(formatted_pod_annotations).merge(formatted_namespace),
               spec: {
                 terminationGracePeriodSeconds:,
-                containers: [
-                  {
-                    name: "app",
-                    image:,
-                    imagePullPolicy:,
-                    stdin: true,
-                    tty: true,
-                    resources: { limits: resource_limits, requests: resource_requests }
-                  }.merge(probes)
-                    .merge(formatted_environment)
-                    .merge(formatted_envfrom)
-                    .merge(formatted_ports)
-                    .merge(formatted_volume_mounts)
-                    .merge(formatted_container_security_context)
-                ] + additional_containers
+                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
             }
           }
         }

data/lib/metatron/templates/job.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Metatron
+  module Templates
+    # Template for basic Job k8s resource
+    class Job < Template
+      include Concerns::Annotated
+      include Concerns::PodProducer
+      include Concerns::Namespaced
+
+      attr_accessor :backoff_limit, :completions, :parallelism, :restart_policy,
+                    :pod_failure_policy, :active_deadline_seconds, :ttl_seconds_after_finished,
+                    :suspend
+
+      alias activeDeadlineSeconds active_deadline_seconds
+      alias backoffLimit backoff_limit
+      alias podFailurePolicy pod_failure_policy
+      alias restartPolicy restart_policy
+      alias ttlSecondsAfterFinished ttl_seconds_after_finished
+
+      def initialize(name)
+        super(name)
+        @api_version = "batch/v1"
+      end
+
+      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/MethodLength
+      def render
+        {
+          apiVersion:,
+          kind:,
+          metadata: {
+            labels: { "#{label_namespace}/name": name }.merge(additional_labels),
+            name:
+          }.merge(formatted_annotations).merge(formatted_namespace),
+          spec: {
+            suspend:,
+            backoffLimit:,
+            activeDeadlineSeconds:,
+            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
+        }
+      end
+      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/MethodLength
+    end
+  end
+end

data/lib/metatron/templates/namespace.rb

@@ -4,6 +4,8 @@ module Metatron
   module Templates
     # Template for basic Namespace k8s resource
     class Namespace < Template
+      include Concerns::Annotated
+
       attr_accessor :additional_labels
 
       def initialize(name)

data/lib/metatron/templates/pod.rb

@@ -8,7 +8,6 @@ module Metatron
       include Concerns::PodProducer
       include Concerns::Namespaced
 
-      # rubocop:disable Metrics/MethodLength
       # rubocop:disable Metrics/AbcSize
       def render
         {
@@ -20,28 +19,15 @@ module Metatron
           }.merge(formatted_annotations).merge(formatted_namespace),
           spec: {
             terminationGracePeriodSeconds:,
-            containers: [
-              {
-                name: "app",
-                image:,
-                imagePullPolicy:,
-                stdin: true,
-                tty: true,
-                resources: { limits: resource_limits, requests: resource_requests }
-              }.merge(probes)
-                .merge(formatted_environment)
-                .merge(formatted_envfrom)
-                .merge(formatted_ports)
-                .merge(formatted_volume_mounts)
-                .merge(formatted_container_security_context)
-            ] + additional_containers
+            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
         }
       end
       # rubocop:enable Metrics/AbcSize
-      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/metatron/templates/replica_set.rb

@@ -37,24 +37,12 @@ module Metatron
               }.merge(formatted_pod_annotations),
               spec: {
                 terminationGracePeriodSeconds:,
-                containers: [
-                  {
-                    name: "app",
-                    image:,
-                    imagePullPolicy:,
-                    stdin: true,
-                    tty: true,
-                    resources: { limits: resource_limits, requests: resource_requests }
-                  }.merge(probes)
-                    .merge(formatted_environment)
-                    .merge(formatted_envfrom)
-                    .merge(formatted_ports)
-                    .merge(formatted_volume_mounts)
-                    .merge(formatted_container_security_context)
-                ] + additional_containers
+                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
             }
           }
         }

data/lib/metatron/templates/stateful_set.rb

@@ -47,24 +47,12 @@ module Metatron
               }.merge(formatted_pod_annotations),
               spec: {
                 terminationGracePeriodSeconds:,
-                containers: [
-                  {
-                    name: "app",
-                    image:,
-                    imagePullPolicy:,
-                    stdin: true,
-                    tty: true,
-                    resources: { limits: resource_limits, requests: resource_requests }
-                  }.merge(probes)
-                    .merge(formatted_environment)
-                    .merge(formatted_envfrom)
-                    .merge(formatted_ports)
-                    .merge(formatted_volume_mounts)
-                    .merge(formatted_security_context)
-                ] + additional_containers
+                containers: containers.map(&:render),
+                init_containers: init_containers.any? ? init_containers.map(&:render) : nil
               }.merge(formatted_volumes)
                 .merge(formatted_affinity)
                 .merge(formatted_tolerations)
+                .compact
             }
           }
         }

data/lib/metatron/version.rb

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

data/lib/metatron.rb

@@ -28,6 +28,9 @@ require "metatron/template"
 require "metatron/templates/concerns/annotated"
 require "metatron/templates/concerns/namespaced"
 require "metatron/templates/concerns/pod_producer"
+require "metatron/templates/container"
+require "metatron/templates/job"
+require "metatron/templates/cron_job"
 require "metatron/templates/pod"
 require "metatron/templates/persistent_volume_claim"
 require "metatron/templates/deployment"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metatron
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -260,9 +260,12 @@ files:
 - lib/metatron/templates/concerns/namespaced.rb
 - lib/metatron/templates/concerns/pod_producer.rb
 - lib/metatron/templates/config_map.rb
+- lib/metatron/templates/container.rb
+- lib/metatron/templates/cron_job.rb
 - lib/metatron/templates/daemon_set.rb
 - lib/metatron/templates/deployment.rb
 - lib/metatron/templates/ingress.rb
+- lib/metatron/templates/job.rb
 - lib/metatron/templates/namespace.rb
 - lib/metatron/templates/persistent_volume_claim.rb
 - lib/metatron/templates/pod.rb