metatron 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fda98cad9b41601c8d028c589e9283480d3320914b8c04055f25863b09cf6ac
-  data.tar.gz: f894ee38131cf57ba700ecf88ab047297f455d8df75aabb14540c53e425876ce
+  metadata.gz: 9904b986356c64a1f895a522baf591911fdd4bdce61d47d94b8db3a05148b11f
+  data.tar.gz: e5230c29009ef2cbf5c9721fa13ddfc65dad02114dfd4c8fd24e9d6873ae0d47
 SHA512:
-  metadata.gz: 796b1c32cba1876e03e70fbf1c580825a9fcb24a28fac0fc0bbdb559ac7810823de4bd1c0852dd5ee4f3c16af72147e643d51d7a9568f2022c8cd102054f2205
-  data.tar.gz: 2d5c10480b359d1c8ae19dcb7c5fc8a4109b0a37999ff0ed031bac42b148fd75c1f482379dd9bfaffa4c3051dc29c26c623c5a13385e1be30a983ddddf30da04
+  metadata.gz: 3886638f6f20c362c519e1ddf5fa1a5067bc00d038d37586c9fc11c5ff887a7f1518b957ef334ffeabe02cae7938f75732f6ef1f68941c80fe70f66c9bbc5804
+  data.tar.gz: 71b9e8ec7e997d71c4369caef8a6f45d74ee6e9120a01a6d8d5723057dd8c76d954cd879df94365050ae2bcf2786f2415578c32ec8d70eebe23049b79cc3a0d9

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    metatron (0.1.7)
+    metatron (0.1.9)
       json (~> 2.6)
-      puma (~> 5.6)
+      puma (~> 6.3)
       sinatra (~> 2.2)
       sinatra-contrib (~> 2.2)
 
@@ -17,34 +17,37 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     e2mmap (0.1.0)
-    jaro_winkler (1.5.4)
+    jaro_winkler (1.5.6)
     json (2.6.3)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
+    language_server-protocol (3.17.0.3)
     multi_json (1.15.0)
     mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
     nio4r (2.5.9)
-    nokogiri (1.14.2-arm64-darwin)
+    nokogiri (1.15.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-linux)
+    nokogiri (1.15.3-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.2.2.0)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
-    puma (5.6.5)
+      racc
+    puma (6.3.0)
       nio4r (~> 2.0)
-    racc (1.6.2)
-    rack (2.2.6.4)
+    racc (1.7.1)
+    rack (2.2.7)
     rack-protection (2.2.4)
       rack
     rack-test (2.1.0)
       rack (>= 1.3)
     rainbow (3.1.1)
     rake (12.3.3)
-    regexp_parser (2.7.0)
+    rbs (2.8.4)
+    regexp_parser (2.8.1)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
@@ -52,34 +55,38 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.49.0)
+    rspec-support (3.12.1)
+    rubocop (1.55.0)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.0)
+    rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.17.1)
+    rubocop-capybara (2.18.0)
       rubocop (~> 1.41)
+    rubocop-factory_bot (2.23.1)
+      rubocop (~> 1.33)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.19.0)
+    rubocop-rspec (2.22.0)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     simplecov (0.22.0)
@@ -102,30 +109,28 @@ GEM
       rack-protection (= 2.2.4)
       sinatra (= 2.2.4)
       tilt (~> 2.0)
-    solargraph (0.48.0)
+    solargraph (0.49.0)
       backport (~> 1.2)
       benchmark
-      bundler (>= 1.17.2)
+      bundler (~> 2.0)
       diff-lcs (~> 1.4)
       e2mmap
       jaro_winkler (~> 1.5)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
       parser (~> 3.0)
-      reverse_markdown (>= 1.0.5, < 3)
-      rubocop (>= 0.52)
+      rbs (~> 2.0)
+      reverse_markdown (~> 2.0)
+      rubocop (~> 1.38)
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    thor (1.2.1)
-    tilt (2.1.0)
+    thor (1.2.2)
+    tilt (2.2.0)
     unicode-display_width (2.4.2)
-    webrick (1.7.0)
-    yard (0.9.28)
-      webrick (~> 1.7.0)
+    yard (0.9.34)
 
 PLATFORMS
-  arm64-darwin-21
   arm64-darwin-22
   x86_64-linux
 
@@ -145,4 +150,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.4.6
+   2.4.17

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Metatron
+  module Templates
+    module Concerns
+      # Makes supporting namespaced resources easier
+      module Namespaced
+        def self.included(base)
+          # base.extend ClassMethods
+          base.class_eval do
+            attr_accessor :namespace
+
+            initializer :namespaced_initialize
+          end
+        end
+
+        def namespaced_initialize
+          @namespace = nil
+        end
+
+        def formatted_namespace
+          if namespace
+            { namespace: namespace.is_a?(Namespace) ? namespace.name : namespace }
+          else
+            {}
+          end
+        end
+      end
+    end
+  end
+end

data/lib/metatron/templates/config_map.rb

@@ -5,6 +5,7 @@ module Metatron
     # The ConfigMap Kubernetes resource
     class ConfigMap < Template
       include Concerns::Annotated
+      include Concerns::Namespaced
 
       attr_accessor :additional_labels, :type, :data
 
@@ -21,7 +22,7 @@ module Metatron
           metadata: {
             name:,
             labels: { "#{label_namespace}/name": name }.merge(additional_labels)
-          }.merge(formatted_annotations),
+          }.merge(formatted_annotations).merge(formatted_namespace),
           data:
         }
       end

data/lib/metatron/templates/daemon_set.rb

@@ -5,6 +5,7 @@ module Metatron
     # The DaemonSet Kubernetes resource
     class DaemonSet < Template
       include Concerns::Annotated
+      include Concerns::Namespaced
       include Concerns::PodProducer
 
       attr_accessor :replicas, :additional_labels
@@ -23,7 +24,7 @@ module Metatron
           metadata: {
             name:,
             labels: { "#{label_namespace}/name": name }.merge(additional_labels)
-          }.merge(formatted_annotations),
+          }.merge(formatted_annotations).merge(formatted_namespace),
           spec: {
             selector: {
               matchLabels: { "#{label_namespace}/name": name }.merge(additional_pod_labels)

data/lib/metatron/templates/deployment.rb

@@ -5,6 +5,7 @@ module Metatron
     # The Deployment Kubernetes resource
     class Deployment < Template
       include Concerns::Annotated
+      include Concerns::Namespaced
       include Concerns::PodProducer
 
       attr_accessor :replicas, :additional_labels
@@ -34,7 +35,7 @@ module Metatron
             template: {
               metadata: {
                 labels: { "#{label_namespace}/name": name }.merge(additional_pod_labels)
-              }.merge(formatted_pod_annotations),
+              }.merge(formatted_pod_annotations).merge(formatted_namespace),
               spec: {
                 terminationGracePeriodSeconds:,
                 containers: [

data/lib/metatron/templates/ingress.rb

@@ -4,6 +4,8 @@ module Metatron
   module Templates
     # Template for basic Ingress k8s resource
     class Ingress < Template
+      include Concerns::Namespaced
+
       attr_accessor :ingress_class, :additional_labels, :additional_annotations, :rules, :tls,
                     :cert_manager_cluster_issuer, :cert_manager_issuer, :cert_manager_challenge_type
 
@@ -45,7 +47,7 @@ module Metatron
           cert_manager[:"cert-manager.io/cluster-issuer"] = cert_manager_cluster_issuer
         end
         unless cert_manager.empty?
-          cert_manager[:"cert-manager.io/acme-challenge-type"] = \
+          cert_manager[:"cert-manager.io/acme-challenge-type"] =
             cert_manager_challenge_type || "http01"
         end
 
@@ -76,7 +78,7 @@ module Metatron
           metadata: {
             name:,
             labels: { "#{label_namespace}/name": name }.merge(additional_labels)
-          }.merge(formatted_annotations),
+          }.merge(formatted_annotations).merge(formatted_namespace),
           spec: formatted_rules.merge(formatted_tls)
         }
       end

data/lib/metatron/templates/namespace.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Metatron
+  module Templates
+    # Template for basic Namespace k8s resource
+    class Namespace < Template
+      attr_accessor :additional_labels
+
+      def initialize(name)
+        super(name)
+        @additional_labels = {}
+      end
+
+      def render
+        {
+          apiVersion:,
+          kind:,
+          metadata: {
+            name:,
+            labels: { "#{label_namespace}/name": name }.merge(additional_labels)
+          }.merge(formatted_annotations)
+        }
+      end
+    end
+  end
+end

data/lib/metatron/templates/persistent_volume_claim.rb

@@ -5,6 +5,7 @@ module Metatron
     # The PersistentVolumeClaim Kubernetes resource
     class PersistentVolumeClaim < Template
       include Concerns::Annotated
+      include Concerns::Namespaced
 
       attr_accessor :additional_labels, :storage_class, :access_modes, :storage
 
@@ -28,7 +29,7 @@ module Metatron
           metadata: {
             name:,
             labels: { "#{label_namespace}/name": name }.merge(additional_labels)
-          }.merge(formatted_annotations),
+          }.merge(formatted_annotations).merge(formatted_namespace),
           spec: {
             accessModes: access_modes,
             storageClassName: storage_class,

data/lib/metatron/templates/pod.rb

@@ -6,6 +6,7 @@ module Metatron
     class Pod < Template
       include Concerns::Annotated
       include Concerns::PodProducer
+      include Concerns::Namespaced
 
       # rubocop:disable Metrics/MethodLength
       # rubocop:disable Metrics/AbcSize
@@ -16,7 +17,7 @@ module Metatron
           metadata: {
             labels: { "#{label_namespace}/name": name }.merge(additional_labels),
             name:
-          }.merge(formatted_annotations),
+          }.merge(formatted_annotations).merge(formatted_namespace),
           spec: {
             terminationGracePeriodSeconds:,
             containers: [

data/lib/metatron/templates/replica_set.rb

@@ -6,6 +6,7 @@ module Metatron
     class ReplicaSet < Template
       include Concerns::Annotated
       include Concerns::PodProducer
+      include Concerns::Namespaced
 
       attr_accessor :replicas, :additional_labels
 
@@ -24,7 +25,7 @@ module Metatron
           metadata: {
             name:,
             labels: { "#{label_namespace}/name": name }.merge(additional_labels)
-          }.merge(formatted_annotations),
+          }.merge(formatted_annotations).merge(formatted_namespace),
           spec: {
             replicas:,
             selector: {

data/lib/metatron/templates/secret.rb

@@ -5,6 +5,7 @@ module Metatron
     # The Secret Kubernetes resource
     class Secret < Template
       include Concerns::Annotated
+      include Concerns::Namespaced
 
       attr_accessor :additional_labels, :type, :data
 
@@ -22,7 +23,7 @@ module Metatron
           metadata: {
             name:,
             labels: { "#{label_namespace}/name": name }.merge(additional_labels)
-          }.merge(formatted_annotations),
+          }.merge(formatted_annotations).merge(formatted_namespace),
           type:,
           stringData: data
         }

data/lib/metatron/templates/service.rb

@@ -5,6 +5,7 @@ module Metatron
     # The Service Kubernetes resource
     class Service < Template
       include Concerns::Annotated
+      include Concerns::Namespaced
 
       attr_accessor :type, :selector, :additional_labels, :ports,
                     :additional_selector_labels, :publish_not_ready_addresses
@@ -41,7 +42,7 @@ module Metatron
           metadata: {
             name:,
             labels: { "#{label_namespace}/name": name }.merge(additional_labels)
-          }.merge(formatted_annotations),
+          }.merge(formatted_annotations).merge(formatted_namespace),
           spec: {
             type:,
             selector: selector.merge(additional_selector_labels),

data/lib/metatron/templates/stateful_set.rb

@@ -6,6 +6,7 @@ module Metatron
     class StatefulSet < Template
       include Concerns::Annotated
       include Concerns::PodProducer
+      include Concerns::Namespaced
 
       attr_accessor :replicas, :service_name, :pod_management_policy, :enable_service_links
 
@@ -31,7 +32,7 @@ module Metatron
           metadata: {
             name:,
             labels: { "#{label_namespace}/name": name }.merge(additional_labels)
-          }.merge(formatted_annotations),
+          }.merge(formatted_annotations).merge(formatted_namespace),
           spec: {
             replicas:,
             serviceName:,

data/lib/metatron/version.rb

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

data/lib/metatron.rb

@@ -26,11 +26,13 @@ end
 require "metatron/version"
 require "metatron/template"
 require "metatron/templates/concerns/annotated"
+require "metatron/templates/concerns/namespaced"
 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/namespace"
 require "metatron/templates/replica_set"
 require "metatron/templates/config_map"
 require "metatron/templates/secret"

data/metatron.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = "~> 3.1"
 
   spec.add_runtime_dependency "json",                 "~> 2.6"
-  spec.add_runtime_dependency "puma",                 "~> 5.6"
+  spec.add_runtime_dependency "puma",                 "~> 6.3"
   spec.add_runtime_dependency "sinatra",              "~> 2.2"
   spec.add_runtime_dependency "sinatra-contrib",      "~> 2.2"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metatron
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '6.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '6.3'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -257,11 +257,13 @@ files:
 - lib/metatron/sync_controller.rb
 - lib/metatron/template.rb
 - lib/metatron/templates/concerns/annotated.rb
+- lib/metatron/templates/concerns/namespaced.rb
 - lib/metatron/templates/concerns/pod_producer.rb
 - lib/metatron/templates/config_map.rb
 - lib/metatron/templates/daemon_set.rb
 - lib/metatron/templates/deployment.rb
 - lib/metatron/templates/ingress.rb
+- lib/metatron/templates/namespace.rb
 - lib/metatron/templates/persistent_volume_claim.rb
 - lib/metatron/templates/pod.rb
 - lib/metatron/templates/replica_set.rb