metatron 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dee81a42c5ec6246f3d6a8e9399040dadd9d129b38f1b8b807671f89952fbc9
-  data.tar.gz: 1eb701979a19633f39251635b34aaefc6355ddc6174671e68bab40c6ad7216a3
+  metadata.gz: d3938ca86027d00b6e1f12ce310b5d120240f4741c54c2d250ec7dd661d532f5
+  data.tar.gz: c7f9e703fda8a9113f99f5d2b39e9fcd05970fcefe68fd0389a37a43cff0aacb
 SHA512:
-  metadata.gz: 70ae144a7cc7ed33b0c623cc93045439f3b78c4d4e95ee85da2c6bef23aa41c3cb7c0bde2fb4ef51becf7a794b7e8e2899919c9817e54f3f83027a5b51b5e020
-  data.tar.gz: 627ccee22056a72d03f04e1150d3f3d315350942e5b6f44d07861e17afd051782444922fd04ac9d71c55fe75472794c45cddc2b12144daf4285713d79b91d916
+  metadata.gz: 72575f10175d98b9ee1d62f36b97ac2872c8683e93fb635efd17f4ca11c61187403102d0a1e0e0591980d658346e2d2129060f56a1dc2186d60ae9725569e6c3
+  data.tar.gz: 608ad100ae3a883ebfab8235ad0c9674d757c47996ca2f1189a72d9b37fbcfc01ab9858f095b4137f653a6d31fcf1eb3c2c1aeba77eade46c3e4de0787e01f4b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metatron (0.6.0)
+    metatron (0.6.1)
       json (~> 2.6)
       rack (>= 2.2.8, < 4)
 

data/Rakefile

@@ -23,6 +23,7 @@ task :bump, [:type] do |_t, args|
   new_version = calculate_new_version(type)
   puts "Bumping gem version from #{current_version} to #{new_version}"
   update_version(new_version)
+  update_gem_lock
 end
 
 task default: %i[spec rubocop yard]
@@ -44,6 +45,10 @@ def calculate_new_version(type)
   version.join(".")
 end
 
+def update_gem_lock
+  system("bundle lock --update")
+end
+
 def update_version(new_version)
   file = File.read("lib/metatron/version.rb")
   new_contents = file.gsub(/VERSION = "(.+)"/, %(VERSION = "#{new_version}"))

data/lib/metatron/template.rb

@@ -12,6 +12,28 @@ module Metatron
       def label_namespace
         @label_namespace ||= "metatron.therubyist.org"
       end
+
+      def initializer(*args)
+        @initializers ||= []
+        @initializers += args
+      end
+
+      def initializers
+        @initializers ||= []
+      end
+
+      def nearest_metatron_ancestor
+        return self if metatron_template_class?
+
+        ancestors.find { _1.respond_to?(:metatron_template_class?) && _1.metatron_template_class? }
+      end
+
+      def metatron_template_class?
+        return true if name == "Metatron::Template"
+        return false if name.start_with?("Metatron::Templates::Concerns")
+
+        name.start_with?("Metatron::Templates::")
+      end
     end
 
     def initialize(name)
@@ -25,27 +47,7 @@ module Metatron
 
     alias apiVersion api_version
 
-    def self.initializer(*args)
-      @initializers ||= []
-      @initializers += args
-    end
-
-    def self.initializers
-      @initializers ||= []
-    end
-
-    def self.nearest_metatron_ancestor
-      return self if metatron_template_class?
-
-      ancestors.find { _1.respond_to?(:metatron_template_class?) && _1.metatron_template_class? }
-    end
-
-    def self.metatron_template_class?
-      return true if name == "Metatron::Template"
-      return false if name.start_with?("Metatron::Templates::Concerns")
-
-      name.start_with?("Metatron::Templates::")
-    end
+    def base_labels = { "#{label_namespace}/name": name }
 
     private
 

data/lib/metatron/templates/cluster_role.rb

@@ -22,7 +22,7 @@ module Metatron
           kind:,
           metadata: {
             name:,
-            labels: { "#{label_namespace}/name": name }.merge(additional_labels)
+            labels: base_labels.merge(additional_labels)
           }.merge(formatted_annotations).compact,
           aggregationRule:,
           rules: formatted_rules

data/lib/metatron/templates/cluster_role_binding.rb

@@ -28,7 +28,7 @@ module Metatron
           kind:,
           metadata: {
             name:,
-            labels: { "#{label_namespace}/name": name }.merge(additional_labels)
+            labels: base_labels.merge(additional_labels)
           }.merge(formatted_annotations).compact,
           roleRef:,
           subjects:

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

@@ -104,7 +104,7 @@ module Metatron
         def pod_metadata
           {
             metadata: {
-              labels: { "#{label_namespace}/name": name }.merge(additional_pod_labels)
+              labels: base_labels.merge(additional_pod_labels)
             }.merge(formatted_pod_annotations)
           }
         end

data/lib/metatron/templates/config_map.rb

@@ -23,7 +23,7 @@ module Metatron
           kind:,
           metadata: {
             name:,
-            labels: { "#{label_namespace}/name": name }.merge(additional_labels)
+            labels: base_labels.merge(additional_labels)
           }.merge(formatted_annotations).merge(formatted_namespace).compact,
           data:,
           immutable:

data/lib/metatron/templates/cron_job.rb

@@ -30,7 +30,7 @@ module Metatron
           apiVersion:,
           kind:,
           metadata: {
-            labels: { "#{label_namespace}/name": name }.merge(additional_labels),
+            labels: base_labels.merge(additional_labels),
             name:
           }.merge(formatted_annotations).merge(formatted_namespace),
           spec: {

data/lib/metatron/templates/daemon_set.rb

@@ -21,11 +21,11 @@ module Metatron
           kind:,
           metadata: {
             name:,
-            labels: { "#{label_namespace}/name": name }.merge(additional_labels)
+            labels: base_labels.merge(additional_labels)
           }.merge(formatted_annotations).merge(formatted_namespace),
           spec: {
             selector: {
-              matchLabels: { "#{label_namespace}/name": name }.merge(additional_pod_labels)
+              matchLabels: base_labels.merge(additional_pod_labels)
             }
           }.merge(pod_template)
         }

data/lib/metatron/templates/deployment.rb

@@ -22,13 +22,13 @@ module Metatron
           kind:,
           metadata: {
             name:,
-            labels: { "#{label_namespace}/name": name }.merge(additional_labels)
+            labels: base_labels.merge(additional_labels)
           }.merge(formatted_annotations).merge(formatted_namespace),
           spec: {
             replicas:,
             strategy:,
             selector: {
-              matchLabels: { "#{label_namespace}/name": name }.merge(additional_pod_labels)
+              matchLabels: base_labels.merge(additional_pod_labels)
             }
           }.merge(pod_template).compact
         }

data/lib/metatron/templates/ingress.rb

@@ -77,7 +77,7 @@ module Metatron
           kind:,
           metadata: {
             name:,
-            labels: { "#{label_namespace}/name": name }.merge(additional_labels)
+            labels: base_labels.merge(additional_labels)
           }.merge(formatted_annotations).merge(formatted_namespace),
           spec: formatted_rules.merge(formatted_tls)
         }

data/lib/metatron/templates/job.rb

@@ -28,7 +28,7 @@ module Metatron
           apiVersion:,
           kind:,
           metadata: {
-            labels: { "#{label_namespace}/name": name }.merge(additional_labels),
+            labels: base_labels.merge(additional_labels),
             name:
           }.merge(formatted_annotations).merge(formatted_namespace),
           spec: {

data/lib/metatron/templates/namespace.rb

@@ -19,7 +19,7 @@ module Metatron
           kind:,
           metadata: {
             name:,
-            labels: { "#{label_namespace}/name": name }.merge(additional_labels)
+            labels: base_labels.merge(additional_labels)
           }.merge(formatted_annotations)
         }
       end

data/lib/metatron/templates/persistent_volume_claim.rb

@@ -31,7 +31,7 @@ module Metatron
           kind:,
           metadata: {
             name:,
-            labels: { "#{label_namespace}/name": name }.merge(additional_labels)
+            labels: base_labels.merge(additional_labels)
           }.merge(formatted_annotations).merge(formatted_namespace),
           spec: {
             accessModes:,

data/lib/metatron/templates/pod.rb

@@ -13,7 +13,7 @@ module Metatron
           apiVersion:,
           kind:,
           metadata: {
-            labels: { "#{label_namespace}/name": name }.merge(additional_labels),
+            labels: base_labels.merge(additional_labels),
             name:
           }.merge(formatted_annotations).merge(formatted_namespace)
         }.merge(pod_spec)

data/lib/metatron/templates/replica_set.rb

@@ -22,12 +22,12 @@ module Metatron
           kind:,
           metadata: {
             name:,
-            labels: { "#{label_namespace}/name": name }.merge(additional_labels)
+            labels: base_labels.merge(additional_labels)
           }.merge(formatted_annotations).merge(formatted_namespace),
           spec: {
             replicas:,
             selector: {
-              matchLabels: { "#{label_namespace}/name": name }.merge(additional_pod_labels)
+              matchLabels: base_labels.merge(additional_pod_labels)
             }
           }.merge(pod_template)
         }

data/lib/metatron/templates/role.rb

@@ -21,7 +21,7 @@ module Metatron
           kind:,
           metadata: {
             name:,
-            labels: { "#{label_namespace}/name": name }.merge(additional_labels)
+            labels: base_labels.merge(additional_labels)
           }.merge(formatted_annotations).merge(formatted_namespace).compact,
           rules: formatted_rules
         }.compact

data/lib/metatron/templates/role_binding.rb

@@ -29,7 +29,7 @@ module Metatron
           kind:,
           metadata: {
             name:,
-            labels: { "#{label_namespace}/name": name }.merge(additional_labels)
+            labels: base_labels.merge(additional_labels)
           }.merge(formatted_annotations).merge(formatted_namespace).compact,
           roleRef:,
           subjects:

data/lib/metatron/templates/secret.rb

@@ -22,7 +22,7 @@ module Metatron
           kind:,
           metadata: {
             name:,
-            labels: { "#{label_namespace}/name": name }.merge(additional_labels)
+            labels: base_labels.merge(additional_labels)
           }.merge(formatted_annotations).merge(formatted_namespace).compact,
           type:,
           stringData: data

data/lib/metatron/templates/service.rb

@@ -13,7 +13,7 @@ module Metatron
       def initialize(name, port = nil)
         super(name)
         @type = "ClusterIP"
-        @selector = { "#{label_namespace}/name": name }
+        @selector = base_labels
         @additional_labels = {}
         @additional_selector_labels = {}
         @publish_not_ready_addresses = false
@@ -41,7 +41,7 @@ module Metatron
           kind:,
           metadata: {
             name:,
-            labels: { "#{label_namespace}/name": name }.merge(additional_labels)
+            labels: base_labels.merge(additional_labels)
           }.merge(formatted_annotations).merge(formatted_namespace),
           spec: {
             type:,

data/lib/metatron/templates/service_account.rb

@@ -18,7 +18,7 @@ module Metatron
           automountServiceAccountToken:,
           metadata: {
             name:,
-            labels: { "#{label_namespace}/name": name }.merge(additional_labels)
+            labels: base_labels.merge(additional_labels)
           }.merge(formatted_annotations).merge(formatted_namespace).compact
         }.compact
       end

data/lib/metatron/templates/stateful_set.rb

@@ -25,20 +25,20 @@ module Metatron
       alias strategy= update_strategy=
       alias updateStrategy update_strategy
 
-      def render # rubocop:disable Metrics/AbcSize
+      def render
         {
           apiVersion:,
           kind:,
           metadata: {
             name:,
-            labels: { "#{label_namespace}/name": name }.merge(additional_labels)
+            labels: base_labels.merge(additional_labels)
           }.merge(formatted_annotations).merge(formatted_namespace),
           spec: {
             replicas:,
             serviceName:,
             updateStrategy:,
             selector: {
-              matchLabels: { "#{label_namespace}/name": name }.merge(additional_pod_labels)
+              matchLabels: base_labels.merge(additional_pod_labels)
             }
           }.merge(pod_template).merge(volume_claim_templates).compact
         }

data/lib/metatron/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Metatron
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metatron
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Jonathan Gnagy