metatron 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a89ce9a5fa862d8312310581e5a57b0094bf49bc2934043f9b5578de66e519c
-  data.tar.gz: ebf94d54cce8d9dc11f439731bec655ed5d943f1f77e47a79a788616cffc02f9
+  metadata.gz: 9904b986356c64a1f895a522baf591911fdd4bdce61d47d94b8db3a05148b11f
+  data.tar.gz: e5230c29009ef2cbf5c9721fa13ddfc65dad02114dfd4c8fd24e9d6873ae0d47
 SHA512:
-  metadata.gz: 0ec004038d5ffa21bf0eed37f67079bbfd613dc844b7916713b1855ae5e09f2b10e7e54e1d3bdc4fa03ec3520628719d086d0fdb5eee25a79191817d47f50480
-  data.tar.gz: 91db8671698f68bd9e1e42e2a9baa536daafa12e545d7bc1744b420580f7247929d8a025aed9f7d22800264dd21ec173745e3b0ebfd5c174c448b5fa92ab43d2
+  metadata.gz: 3886638f6f20c362c519e1ddf5fa1a5067bc00d038d37586c9fc11c5ff887a7f1518b957ef334ffeabe02cae7938f75732f6ef1f68941c80fe70f66c9bbc5804
+  data.tar.gz: 71b9e8ec7e997d71c4369caef8a6f45d74ee6e9120a01a6d8d5723057dd8c76d954cd879df94365050ae2bcf2786f2415578c32ec8d70eebe23049b79cc3a0d9

data/Gemfile.lock

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

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
 
@@ -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
-    8  # 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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metatron
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-26 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -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