metatron 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dbb4ce75ed3919fbbb31853a4e7d72a3a93ce85262daa8eb060d762223a8599
-  data.tar.gz: c94db73669dbe3e00d68a6d883e9c62072a3007545ce8a69e2df26743a4633a8
+  metadata.gz: 992800d829a067dfad529abd2b4ff606df206b32f214e5851a5d30325d087c5a
+  data.tar.gz: 209c07d8463fdca044763ad0a4cf07b7284ebefd0a4cdf2372d5e80af3b62faf
 SHA512:
-  metadata.gz: d8dfc8c8a4863f9bca41f098e546fbd342dfe008c34f92362fcda293d920c9cc686f63532b969a37a364ada8f4bde86f346efd5c37c1223be0c2f305e58f7c99
-  data.tar.gz: d63951090a4e9729e7ba30249d55b0743a670d4cc6103e3177cc5085f970af010ac72bab9f30a7af29fe668de1c57529ed0225d500b995314693352735ca95e5
+  metadata.gz: 5c66266c6808288c3709631e4cac70d0c60122a5589255c9110a0b4ec09460df22fea9ec43fcc3da5339bb935e2d4a5435f3768f95fda63ce47da78ddfebce99
+  data.tar.gz: 0cf374089c8cc38975cbb96c484c54c37cd769dcc402ceaf4857ba11cd709e4869db951a620d795befc39d900435fbd11fa68bfc5079d3237cf55b6ca012a997

data/.roxanne.yml

@@ -1,14 +1,14 @@
 version: 1.0
 stages:
   build:
-    image: ruby:3.1
+    image: ruby:3.2
     scripts:
     - ./scripts/build.sh
   test:
-    image: ruby:3.1
+    image: ruby:3.2
     scripts:
     - ./scripts/test.sh
   release:
-    image: ruby:3.1
+    image: ruby:3.2
     only:
     - main

data/.ruby-version

@@ -1 +1 @@
-3.1.2
+3.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metatron (0.1.3)
+    metatron (0.1.5)
       json (~> 2.6)
       puma (~> 5.6)
       sinatra (~> 2.2)
@@ -32,15 +32,15 @@ GEM
     nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
     parallel (1.22.1)
-    parser (3.2.1.0)
+    parser (3.2.1.1)
       ast (~> 2.4.1)
     puma (5.6.5)
       nio4r (~> 2.0)
     racc (1.6.2)
-    rack (2.2.6.2)
+    rack (2.2.6.4)
     rack-protection (2.2.4)
       rack
-    rack-test (2.0.2)
+    rack-test (2.1.0)
       rack (>= 1.3)
     rainbow (3.1.1)
     rake (12.3.3)
@@ -57,30 +57,30 @@ GEM
     rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.45.1)
+    rubocop (1.48.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.26.0)
+    rubocop-ast (1.27.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.17.0)
+    rubocop-capybara (2.17.1)
       rubocop (~> 1.41)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.18.1)
+    rubocop-rspec (2.19.0)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -118,7 +118,7 @@ GEM
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
     thor (1.2.1)
-    tilt (2.0.11)
+    tilt (2.1.0)
     unicode-display_width (2.4.2)
     webrick (1.7.0)
     yard (0.9.28)
@@ -126,6 +126,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
+  arm64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
@@ -144,4 +145,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.3.18
+   2.4.6

data/lib/metatron/template.rb

@@ -10,6 +10,7 @@ module Metatron
       @name = name
       @label_namespace = "metatron.therubyist.org"
       @api_version = "v1"
+      @kind = self.class.name.split("::").last
       run_initializers
     end
 

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

@@ -11,7 +11,8 @@ module Metatron
             attr_accessor :image, :image_pull_policy, :additional_labels, :env, :envfrom,
                           :resource_limits, :resource_requests, :probes, :ports, :security_context,
                           :volume_mounts, :volumes, :additional_containers,
-                          :container_security_context, :affinity, :termination_grace_period_seconds
+                          :container_security_context, :affinity, :termination_grace_period_seconds,
+                          :tolerations
 
             initializer :pod_producer_initialize
 
@@ -40,11 +41,10 @@ module Metatron
           @additional_containers = []
           @additional_labels = {}
           @termination_grace_period_seconds = 60
+          @tolerations = []
         end
 
-        def formatted_affinity
-          affinity && !affinity.empty? ? { affinity: } : {}
-        end
+        def formatted_affinity = affinity && !affinity.empty? ? { affinity: } : {}
 
         def formatted_environment
           env && !env.empty? ? { env: env.map { |k, v| { name: k, value: v } } } : {}
@@ -58,9 +58,7 @@ module Metatron
           end
         end
 
-        def formatted_ports
-          ports&.any? ? { ports: } : {}
-        end
+        def formatted_ports = ports&.any? ? { ports: } : {}
 
         def formatted_security_context
           security_context && !security_context.empty? ? { securityContext: } : {}
@@ -74,13 +72,9 @@ module Metatron
           end
         end
 
-        def formatted_volume_mounts
-          volume_mounts&.any? ? { volumeMounts: } : {}
-        end
-
-        def formatted_volumes
-          volumes&.any? ? { volumes: } : {}
-        end
+        def formatted_tolerations = tolerations&.any? ? { tolerations: } : {}
+        def formatted_volume_mounts = volume_mounts&.any? ? { volumeMounts: } : {}
+        def formatted_volumes = volumes&.any? ? { volumes: } : {}
       end
     end
   end

data/lib/metatron/templates/daemon_set.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Metatron
+  module Templates
+    # The DaemonSet Kubernetes resource
+    class DaemonSet < Template
+      include Concerns::Annotated
+      include Concerns::PodProducer
+
+      attr_accessor :replicas, :pod_annotations,
+                    :additional_labels, :additional_pod_labels
+
+      def initialize(name)
+        super(name)
+        @api_version = "apps/v1"
+        @pod_annotations = {}
+        @additional_pod_labels = {}
+      end
+
+      def formatted_pod_annotations
+        pod_annotations && !pod_annotations.empty? ? { annotations: pod_annotations } : {}
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/AbcSize
+      def render
+        {
+          apiVersion:,
+          kind:,
+          metadata: {
+            name:,
+            labels: { "#{label_namespace}/name": name }.merge(additional_labels)
+          }.merge(formatted_annotations),
+          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: [
+                  {
+                    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
+              }.merge(formatted_volumes)
+                .merge(formatted_security_context)
+                .merge(formatted_tolerations)
+            }
+          }
+        }
+      end
+      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/MethodLength
+    end
+  end
+end

data/lib/metatron/templates/deployment.rb

@@ -13,7 +13,6 @@ module Metatron
       def initialize(name, replicas: 2)
         super(name)
         @api_version = "apps/v1"
-        @kind = "Deployment"
         @replicas = replicas
         @pod_annotations = {}
         @additional_pod_labels = {}
@@ -60,7 +59,9 @@ module Metatron
                     .merge(formatted_volume_mounts)
                     .merge(formatted_container_security_context)
                 ] + additional_containers
-              }.merge(formatted_volumes).merge(formatted_security_context)
+              }.merge(formatted_volumes)
+                .merge(formatted_security_context)
+                .merge(formatted_tolerations)
             }
           }
         }

data/lib/metatron/templates/ingress.rb

@@ -9,10 +9,8 @@ module Metatron
 
       def initialize(name, ingress_class = "nginx")
         super(name)
-        @name = name
         @ingress_class = ingress_class
         @api_version = "networking.k8s.io/v1"
-        @kind = "Ingress"
         @additional_labels = {}
         @additional_annotations = {}
       end

data/lib/metatron/templates/persistent_volume_claim.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Metatron
+  module Templates
+    # The PersistentVolumeClaim Kubernetes resource
+    class PersistentVolumeClaim < Template
+      include Concerns::Annotated
+
+      attr_accessor :additional_labels, :storage_class, :access_modes, :storage
+
+      def initialize(
+        name,
+        storage_class:,
+        storage:,
+        access_modes: ["ReadWriteOnce"]
+      )
+        super(name)
+        @storage_class = storage_class
+        @access_modes = access_modes
+        @storage = storage
+        @additional_labels = {}
+      end
+
+      def render
+        {
+          apiVersion:,
+          kind:,
+          metadata: {
+            name:,
+            labels: { "#{label_namespace}/name": name }.merge(additional_labels)
+          }.merge(formatted_annotations),
+          spec: {
+            accessModes: access_modes,
+            storageClassName: storage_class,
+            resources: {
+              requests: {
+                storage:
+              }
+            }
+          }
+        }
+      end
+    end
+  end
+end

data/lib/metatron/templates/pod.rb

@@ -7,11 +7,6 @@ module Metatron
       include Concerns::Annotated
       include Concerns::PodProducer
 
-      def initialize(name)
-        super(name)
-        @kind = "Pod"
-      end
-
       # rubocop:disable Metrics/MethodLength
       # rubocop:disable Metrics/AbcSize
       def render
@@ -39,7 +34,9 @@ module Metatron
                 .merge(formatted_volume_mounts)
                 .merge(formatted_container_security_context)
             ] + additional_containers
-          }.merge(formatted_volumes).merge(formatted_security_context)
+          }.merge(formatted_volumes)
+            .merge(formatted_security_context)
+            .merge(formatted_tolerations)
         }
       end
       # rubocop:enable Metrics/AbcSize

data/lib/metatron/templates/replica_set.rb

@@ -13,7 +13,6 @@ module Metatron
       def initialize(name, replicas: 2)
         super(name)
         @api_version = "apps/v1"
-        @kind = "ReplicaSet"
         @replicas = replicas
         @pod_annotations = {}
         @additional_pod_labels = {}
@@ -59,7 +58,9 @@ module Metatron
                     .merge(formatted_volume_mounts)
                     .merge(formatted_container_security_context)
                 ] + additional_containers
-              }.merge(formatted_volumes).merge(formatted_security_context)
+              }.merge(formatted_volumes)
+                .merge(formatted_security_context)
+                .merge(formatted_tolerations)
             }
           }
         }

data/lib/metatron/templates/secret.rb

@@ -12,7 +12,6 @@ module Metatron
         super(name)
         @data = data
         @additional_labels = {}
-        @kind = "Secret"
         @type = "Opaque"
       end
 

data/lib/metatron/templates/service.rb

@@ -11,7 +11,6 @@ module Metatron
 
       def initialize(name, port = nil)
         super(name)
-        @kind = "Service"
         @type = "ClusterIP"
         @selector = { "#{label_namespace}/name": name }
         @additional_labels = {}

data/lib/metatron/templates/stateful_set.rb

@@ -15,7 +15,6 @@ module Metatron
         super(name)
         @replicas = replicas
         @api_version = "apps/v1"
-        @kind = "StatefulSet"
         @pod_annotations = {}
         @pod_management_policy = "OrderedReady"
         @additional_pod_labels = {}
@@ -72,6 +71,7 @@ module Metatron
                 ] + additional_containers
               }.merge(formatted_volumes)
                 .merge(formatted_affinity)
+                .merge(formatted_tolerations)
             }
           }
         }

data/lib/metatron/version.rb

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

data/lib/metatron.rb

@@ -28,6 +28,7 @@ require "metatron/template"
 require "metatron/templates/concerns/annotated"
 require "metatron/templates/concerns/pod_producer"
 require "metatron/templates/pod"
+require "metatron/templates/persistent_volume_claim"
 require "metatron/templates/deployment"
 require "metatron/templates/ingress"
 require "metatron/templates/replica_set"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metatron
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-15 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -258,8 +258,10 @@ files:
 - lib/metatron/template.rb
 - lib/metatron/templates/concerns/annotated.rb
 - lib/metatron/templates/concerns/pod_producer.rb
+- lib/metatron/templates/daemon_set.rb
 - lib/metatron/templates/deployment.rb
 - lib/metatron/templates/ingress.rb
+- lib/metatron/templates/persistent_volume_claim.rb
 - lib/metatron/templates/pod.rb
 - lib/metatron/templates/replica_set.rb
 - lib/metatron/templates/secret.rb
@@ -291,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: So meta