metatron 0.10.1 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfe544a98c67ba6ae97f9e09fac9a58483c169fd067f89484b2d454f2d290d43
-  data.tar.gz: b40a06690c8eaf0f226e82ebe17a24916724e178bd8b63765dfed4a9ee9f8762
+  metadata.gz: 637a01440642c97b47387f9de1865755b910c2ea65a875942fb1a93baf222092
+  data.tar.gz: 6a490b15624d363fb64099c8b8218e5814a2d0b4a263391f11441d409cce21da
 SHA512:
-  metadata.gz: cfe09b2799cef530b00ce400f56d880236ef7c263806f81300a97139da739c57358a3ea5708f69c230c14d554a341b4d7f10c88536f112a85a18d52799d7f892
-  data.tar.gz: 2d6aa1b21ead7c64f227d9c819164fa07a06c0a7ac312981b73a5d0c4c83915d01d72258507285ed1468287471eadda77d697dca340a4c4c9b7aedb9fde0af16
+  metadata.gz: 817b348a265c5f447614e4e7cfb486ddc8fa9f95225f3750a2f0beb5ecd13c5fac252b3d82a3a941d52db472055897acb1202702f7279b3b56cfaa88c8aafa07
+  data.tar.gz: 1e3178a2e560588fe36cf8c933862805f07facd1e583f71edbb872bd1075c6cd650c3c49e4334a5a0a3261c469c0960a171b47ea6b9b0eca655ada86f289dd24

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.10.1"
+  ".": "0.11.1"
 }

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [0.11.1](https://github.com/jgnagy/metatron/compare/metatron/v0.11.0...metatron/v0.11.1) (2025-04-11)
+
+
+### Features
+
+* **templates:** add volume snapshot and content ([b969ce6](https://github.com/jgnagy/metatron/commit/b969ce6dc93503eb08c15d72356691acf88f7db9))
+
+## [0.11.0](https://github.com/jgnagy/metatron/compare/metatron/v0.10.1...metatron/v0.11.0) (2025-03-28)
+
+
+### ⚠ BREAKING CHANGES
+
+* **templates:** secret now base64 encodes
+* **templates:** omit attribute when default
+
+### Code Refactoring
+
+* **templates:** omit attribute when default ([0add60c](https://github.com/jgnagy/metatron/commit/0add60c5ef9faca5e1c7be050415ef3a1f15227b))
+* **templates:** secret now base64 encodes ([3d263ec](https://github.com/jgnagy/metatron/commit/3d263ec85b9d7e87b987c2fcf4c6fc9664eb84d6))
+
 ## [0.10.1](https://github.com/jgnagy/metatron/compare/metatron/v0.10.0...metatron/v0.10.1) (2025-03-21)
 
 

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    metatron (0.10.1)
+    metatron (0.11.1)
+      base64
       json (~> 2.6)
       rack (>= 2.2.8, < 4)
 
@@ -10,6 +11,7 @@ GEM
   specs:
     ast (2.4.2)
     backport (1.2.0)
+    base64 (0.2.0)
     benchmark (0.4.0)
     byebug (11.1.3)
     diff-lcs (1.6.0)
@@ -23,9 +25,9 @@ GEM
     language_server-protocol (3.17.0.4)
     lint_roller (1.1.0)
     logger (1.6.6)
-    nokogiri (1.18.3-arm64-darwin)
+    nokogiri (1.18.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.3-x86_64-linux-gnu)
+    nokogiri (1.18.4-x86_64-linux-gnu)
       racc (~> 1.4)
     observer (0.1.2)
     ostruct (0.6.1)

data/lib/metatron/templates/secret.rb

@@ -7,15 +7,38 @@ module Metatron
       include Concerns::Annotated
       include Concerns::Namespaced
 
-      attr_accessor :additional_labels, :type, :data
+      attr_accessor :additional_labels, :type, :data, :string_data
 
-      def initialize(name, data = {})
+      alias stringData string_data
+
+      def initialize(name, provided_string_data = nil, string_data: nil, data: nil)
         super(name)
+        @string_data = string_data || provided_string_data
         @data = data
         @additional_labels = {}
         @type = "Opaque"
       end
 
+      def formatted_data
+        data_hash = {}
+
+        # Only include one of data or string_data, preferring data if both are present
+        return data_hash unless data || string_data
+
+        # If string_data is provided, it should be a hash of string values
+        # and will be base64 encoded
+        if string_data
+          data_hash[:data] = string_data.transform_values do |value|
+            Base64.strict_encode64(value.to_s).gsub("\n", "")
+          end
+        end
+
+        # If data is provided, it should be a hash of base64 encoded values
+        data_hash[:data] = data if data
+
+        data_hash
+      end
+
       def render
         {
           apiVersion:,
@@ -24,9 +47,8 @@ module Metatron
             name:,
             labels: base_labels.merge(additional_labels)
           }.merge(formatted_annotations).merge(formatted_namespace).compact,
-          type:,
-          stringData: data
-        }.compact
+          type:
+        }.compact.merge(formatted_data).compact
       end
     end
   end

data/lib/metatron/templates/service.rb

@@ -40,6 +40,10 @@ module Metatron
         ports&.any? ? { ports: } : {}
       end
 
+      def formatted_publish_not_ready_addresses
+        publish_not_ready_addresses ? { publishNotReadyAddresses: } : {}
+      end
+
       def render
         {
           apiVersion:,
@@ -51,9 +55,8 @@ module Metatron
           spec: {
             type:,
             selector: selector.merge(additional_selector_labels),
-            publishNotReadyAddresses:,
             clusterIP:
-          }.compact.merge(formatted_ports)
+          }.compact.merge(formatted_ports).merge(formatted_publish_not_ready_addresses)
         }
       end
     end

data/lib/metatron/templates/volume_snapshot.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Metatron
+  module Templates
+    # The VolumeSnapshot Kubernetes resource
+    class VolumeSnapshot < Template
+      include Concerns::Annotated
+      include Concerns::Namespaced
+
+      attr_accessor :source, :volume_snapshot_class_name
+
+      alias volumeSnapshotClassName volume_snapshot_class_name
+
+      def initialize(name, source: {}, volume_snapshot_class_name: nil)
+        super(name)
+        @source = source
+        @volume_snapshot_class_name = volume_snapshot_class_name
+        @api_version = "snapshot.storage.k8s.io/v1"
+      end
+
+      def render
+        {
+          apiVersion:,
+          kind:,
+          metadata: {
+            name:,
+            labels: base_labels.merge(additional_labels)
+          }.merge(formatted_annotations).merge(formatted_namespace).compact,
+          spec: {}.merge(formatted_source).merge(formatted_volume_snapshot_class_name).compact
+        }.compact
+      end
+
+      def formatted_source
+        case source
+        when Hash
+          { source: }
+        when Metatron::Templates::VolumeSnapshotContent
+          { source: { volumeSnapshotContentName: source.name } }
+        when Metatron::Templates::PersistentVolumeClaim
+          { source: { persistentVolumeClaimName: source.name } }
+        when nil
+          {}
+        else
+          raise ArgumentError,
+                "Invalid source type: #{source.class}. " \
+                "Expected Hash, VolumeSnapshotContent, or PersistentVolumeClaim."
+        end
+      end
+
+      def formatted_volume_snapshot_class_name
+        return {} unless volume_snapshot_class_name
+
+        if volume_snapshot_class_name.is_a?(String)
+          { volumeSnapshotClassName: }
+        elsif volume_snapshot_class_name.respond_to?(:name)
+          { volumeSnapshotClassName: volume_snapshot_class_name.name }
+        else
+          raise ArgumentError,
+                "Invalid volume_snapshot_class_name type: #{volume_snapshot_class_name.class}."
+        end
+      end
+    end
+  end
+end

data/lib/metatron/templates/volume_snapshot_content.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Metatron
+  module Templates
+    # The VolumeSnapshotContent Kubernetes resource
+    class VolumeSnapshotContent < Template
+      include Concerns::Annotated
+      include Concerns::Namespaced
+
+      attr_accessor :source, :deletion_policy, :driver, :source_volume_mode, :volume_snapshot_ref
+
+      alias deletionPolicy deletion_policy
+      alias sourceVolumeMode source_volume_mode
+      alias volumeSnapshotRef volume_snapshot_ref
+
+      def initialize(name, driver:, source: {}, deletion_policy: "Delete",
+                     volume_snapshot_ref: nil, source_volume_mode: "Filesystem")
+        super(name)
+        @api_version = "snapshot.storage.k8s.io/v1"
+        @driver = driver
+        @source = source
+        @source_volume_mode = source_volume_mode
+        @deletion_policy = deletion_policy
+        @volume_snapshot_ref = volume_snapshot_ref
+      end
+
+      def render
+        {
+          apiVersion:,
+          kind:,
+          metadata: {
+            name:,
+            labels: base_labels.merge(additional_labels)
+          }.merge(formatted_annotations).merge(formatted_namespace).compact,
+          spec: {
+            driver:,
+            deletionPolicy:,
+            sourceVolumeMode:
+          }.merge(formatted_source).merge(formatted_volume_snapshot_ref).compact
+        }.compact
+      end
+
+      def formatted_source
+        return {} unless source
+        raise ArgumentError, "Invalid source type: #{source.class}." unless source.is_a?(Hash)
+
+        { source: }
+      end
+
+      def formatted_volume_snapshot_ref
+        return {} unless volume_snapshot_ref
+
+        if volume_snapshot_ref.is_a?(Hash)
+          { volumeSnapshotRef: }
+        elsif volume_snapshot_ref.is_a?(VolumeSnapshot)
+          {
+            volumeSnapshotRef: {
+              name: volume_snapshot_ref.name,
+              namespace: volume_snapshot_ref.namespace
+            }.compact
+          }
+        else
+          raise ArgumentError,
+                "Invalid volume_snapshot_ref type: #{volume_snapshot_ref.class}."
+        end
+      end
+    end
+  end
+end

data/lib/metatron/version.rb

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

data/lib/metatron.rb

@@ -6,6 +6,9 @@ require "securerandom"
 require "time"
 require "logger"
 
+# external requirements
+require "base64"
+
 # The top-level module for Metatron
 module Metatron
   class Error < StandardError; end
@@ -44,6 +47,8 @@ require "metatron/templates/secret"
 require "metatron/templates/service"
 require "metatron/templates/service_account"
 require "metatron/templates/stateful_set"
+require "metatron/templates/volume_snapshot"
+require "metatron/templates/volume_snapshot_content"
 require "metatron/controller"
 require "metatron/composite_controller"
 require "metatron/controllers/ping"

data/metatron.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = "~> 3.1"
 
+  spec.add_dependency "base64"
   spec.add_dependency "json", "~> 2.6"
   spec.add_dependency "rack", ">= 2.2.8", "< 4"
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: metatron
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.1
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-21 00:00:00.000000000 Z
+date: 2025-04-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -267,6 +281,8 @@ files:
 - lib/metatron/templates/service.rb
 - lib/metatron/templates/service_account.rb
 - lib/metatron/templates/stateful_set.rb
+- lib/metatron/templates/volume_snapshot.rb
+- lib/metatron/templates/volume_snapshot_content.rb
 - lib/metatron/version.rb
 - metatron.gemspec
 - release-please-config.json