metatron 0.8.8 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 391fa61dd0511b360cf7a0327d6b5de19d9094908349feb79804ef2695db0950
-  data.tar.gz: 1db1d4a4590db27056933cb052445f2fecb4a856d024e0df8322e7379e3414ba
+  metadata.gz: d7a6131869b316def00f00a41810b2aa467b4767d1fc360eb74105ce534568e8
+  data.tar.gz: f2d924bbc2240d5c04cde9942fb4907b585fce9434f6185b896dcf86afb3323a
 SHA512:
-  metadata.gz: 305f8fd71865860a6f85e21c79f0f6426bcb0cf260e63483d09c192a326de713db53f1da8a64728c336627ea239d6cb55c25272f56ca44785ed48d1c7300a6d9
-  data.tar.gz: effcc2c4603ead394a4a816412cf0460ff9c52a21621987492b17433e239fb8f695e014b252a463f32cecd41d76f5d6cb112bbbd32417ab93aaad5e7c971a148
+  metadata.gz: fe29d9fc841799ce4805cd31d002c9fa86e0cea5f91e4d8a9544165eb26563a4ec10d6a131434fe3ad54fd4bb1df3625fe6e19ccd1e5e73c66114b38a46209f9
+  data.tar.gz: d0835ea094c3fe4c990d96d711cbc55fcab15b2314008a80a6aec16d76675754425738bbd73744999a304cb7077af424e3d1a024ffadbe818a4f0397a854e535

data/.github/workflows/ci.yml

@@ -0,0 +1,54 @@
+name: CI
+
+on:
+  pull_request:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: .ruby-version
+          bundler-cache: true
+
+      - name: Lint code for consistent style
+        run: bundle exec rubocop -f github
+  
+  yard:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: .ruby-version
+          bundler-cache: true
+
+      - name: Generate YARD documentation
+        run: bundle exec rake yard
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.3', '3.4']
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      
+      - name: Run tests
+        run: bundle exec rake spec

data/.github/workflows/release.yml

@@ -0,0 +1,33 @@
+name: Release
+
+on:
+  push:
+    branches: [ "main" ]
+
+permissions:
+  contents: write
+  id-token: write
+  pull-requests: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+
+      - uses: actions/checkout@v4
+
+      ## Here's the new step for release-please
+      - uses: googleapis/release-please-action@v4
+        id: release
+        with:
+          token: ${{ secrets.AUTO_RELEASE_TOKEN }}
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        if: ${{ steps.release.outputs.release_created }}
+        with:
+          bundler-cache: true
+          ruby-version: .ruby-version
+
+      - uses: rubygems/release-gem@v1
+        if: ${{ steps.release.outputs.release_created }}

data/.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "0.10.0"
+}

data/.rubocop.yml

@@ -1,7 +1,9 @@
 require:
-- rubocop-rake
 - rubocop-rspec
 
+plugins:
+- rubocop-rake
+
 Layout/LineLength:
   Max: 100
 

data/CHANGELOG.md

@@ -0,0 +1,30 @@
+# Changelog
+
+## [0.10.0](https://github.com/jgnagy/metatron/compare/metatron/v0.9.0...metatron/v0.10.0) (2025-03-19)
+
+
+### ⚠ BREAKING CHANGES
+
+* **templates:** pod match labels are distinct
+* **templates:** allow overriding base labels
+
+### Features
+
+* **templates:** allow overriding base labels ([ba3d4c2](https://github.com/jgnagy/metatron/commit/ba3d4c2813518a5b9bb845700656b2ce67321369))
+* **templates:** pod match labels are distinct ([82b59d0](https://github.com/jgnagy/metatron/commit/82b59d0d93cbf1c4423895f20351e2b73d6057e0))
+
+## [0.9.0](https://github.com/jgnagy/metatron/compare/metatron-v0.8.8...metatron/v0.9.0) (2025-02-17)
+
+
+### Features
+
+* **templates:** add priority class template ([a735e47](https://github.com/jgnagy/metatron/commit/a735e470d0a2f5c7c471ec95a7559cbbe8349268))
+* **templates:** add support for pod priority ([f73d7b2](https://github.com/jgnagy/metatron/commit/f73d7b293c26eb0b5e2f65212c87a32b701b2151))
+
+## [0.8.8](https://github.com/jgnagy/metatron/compare/v0.8.2...v0.8.8) (2025-02-16)
+
+
+### Features
+
+* adding support for LimitRange resource ([b779d47](https://github.com/jgnagy/metatron/commit/b779d4764ccf5b0e687ff328e69808ae12ff3c30))
+* adds dataSource and dataSourceRef to PVCs ([5339a4e](https://github.com/jgnagy/metatron/commit/5339a4ea732695530814e281f6d0ae2de3e7889d))

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metatron (0.8.8)
+    metatron (0.10.0)
       json (~> 2.6)
       rack (>= 2.2.8, < 4)
 
@@ -12,19 +12,20 @@ GEM
     backport (1.2.0)
     benchmark (0.4.0)
     byebug (11.1.3)
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.0)
     docile (1.4.1)
     jaro_winkler (1.6.0)
-    json (2.10.1)
+    json (2.10.2)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.4)
-    logger (1.6.5)
-    nokogiri (1.18.2-arm64-darwin)
+    lint_roller (1.1.0)
+    logger (1.6.6)
+    nokogiri (1.18.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.2-x86_64-linux-gnu)
+    nokogiri (1.18.3-x86_64-linux-gnu)
       racc (~> 1.4)
     observer (0.1.2)
     ostruct (0.6.1)
@@ -33,7 +34,7 @@ GEM
       ast (~> 2.4.1)
       racc
     racc (1.8.1)
-    rack (3.1.10)
+    rack (3.1.12)
     rack-test (2.2.0)
       rack (>= 1.3)
     rainbow (3.1.1)
@@ -43,7 +44,7 @@ GEM
     regexp_parser (2.10.0)
     reverse_markdown (3.0.0)
       nokogiri
-    rexml (3.4.0)
+    rexml (3.4.1)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -57,9 +58,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.2)
-    rubocop (1.71.2)
+    rubocop (1.72.1)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
@@ -73,8 +75,9 @@ GEM
       rubocop (~> 1.41)
     rubocop-factory_bot (2.26.1)
       rubocop (~> 1.61)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
     rubocop-rspec (2.31.0)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)

data/Rakefile

@@ -8,7 +8,7 @@ require "rubocop/rake_task"
 require "yard"
 
 RSpec::Core::RakeTask.new(:spec)
-RuboCop::RakeTask.new(:rubocop)
+RuboCop::RakeTask.new(:rubocop) # (moved to dedicated github action job)
 YARD::Rake::YardocTask.new
 
 desc "allows running a demo controller"
@@ -16,41 +16,4 @@ task :demo do
   system("rackup --host 0.0.0.0 -P #{File.expand_path(".")}/tmp/daemon.pid")
 end
 
-desc "automatically bump the gem's version"
-task :bump, [:type] do |_t, args|
-  type = args[:type] || ENV["TYPE"] || "patch"
-  current_version = Metatron::VERSION
-  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]
-
-def calculate_new_version(type)
-  version = Metatron::VERSION.split(".").map(&:to_i)
-  case type
-  when "patch"
-    version[2] += 1
-  when "minor"
-    version[1] += 1
-    version[2] = 0
-  when "major"
-    version[0] += 1
-    version[1] = 0
-    version[2] = 0
-  end
-
-  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}"))
-  File.write("lib/metatron/version.rb", new_contents)
-end

data/lib/metatron/composite_controller.rb

@@ -15,8 +15,6 @@ module Metatron
     def finalize = raise NotImplementedError
     def sync = raise NotImplementedError
 
-    private
-
     STRATEGY = {
       "/customize" => { data: :customize, etag: :calculate_customize_etag },
       # finalize calls should be rare and unique enough that we don't need to worry about ETags
@@ -24,6 +22,8 @@ module Metatron
       "/sync" => { data: :sync, etag: :calculate_sync_etag }
     }.freeze
 
+    private
+
     def _call
       return access_control_allow_methods if request.options?
       return not_found unless request.post?

data/lib/metatron/template.rb

@@ -4,7 +4,8 @@ module Metatron
   # Base class for templating Kubernetes resources
   class Template
     attr_accessor :api_version, :name, :additional_labels
-    attr_reader :kind, :label_namespace
+    attr_reader :kind
+    attr_writer :base_labels
 
     class << self
       attr_writer :label_namespace
@@ -38,7 +39,6 @@ module Metatron
 
     def initialize(name)
       @name = name
-      @label_namespace = self.class.label_namespace
       @api_version = "v1"
       @kind = find_kind
       @additional_labels = {}
@@ -47,10 +47,15 @@ module Metatron
 
     alias apiVersion api_version
 
-    def base_labels = { "#{label_namespace}/name": name }
+    def base_labels
+      @base_labels || { "#{label_namespace}/name": name }
+    end
 
     private
 
+    # defers to the nearest metatron ancestor to determine the label namespace
+    def label_namespace = self.class.label_namespace
+
     def run_initializers
       self.class.nearest_metatron_ancestor.initializers.each { send(_1.to_sym) }
     end

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

@@ -9,13 +9,13 @@ module Metatron
           # base.extend ClassMethods
           base.class_eval do
             attr_accessor :active_deadline_seconds, :additional_pod_labels,
-                          :affinity, :automount_service_account_token, :containers,
-                          :dns_policy, :enable_service_links, :hostname, :host_ipc, :host_network,
-                          :host_pid, :image_pull_secrets, :init_containers, :node_selector,
-                          :node_name, :persistent_volume_claims, :pod_annotations, :restart_policy,
-                          :scheduler_name, :security_context, :service_account,
-                          :service_account_name, :share_process_namespace, :subdomain,
-                          :termination_grace_period_seconds, :tolerations, :volumes
+                          :additional_pod_match_labels, :affinity, :automount_service_account_token,
+                          :containers, :dns_policy, :enable_service_links, :hostname, :host_ipc,
+                          :host_network, :host_pid, :image_pull_secrets, :init_containers,
+                          :node_selector, :node_name, :persistent_volume_claims, :pod_annotations,
+                          :priority_class_name, :restart_policy, :scheduler_name, :security_context,
+                          :service_account, :service_account_name, :share_process_namespace,
+                          :subdomain, :termination_grace_period_seconds, :tolerations, :volumes
 
             initializer :pod_producer_initialize
 
@@ -26,6 +26,7 @@ module Metatron
             alias_method :hostIPC, :host_ipc
             alias_method :hostNetwork, :host_network
             alias_method :hostPID, :host_pid
+            alias_method :priorityClassName, :priority_class_name
             alias_method :nodeSelector, :node_selector
             alias_method :nodeName, :node_name
             alias_method :restartPolicy, :restart_policy
@@ -40,6 +41,7 @@ module Metatron
 
         def pod_producer_initialize
           @additional_pod_labels = {}
+          @additional_pod_match_labels = {}
           @affinity = {}
           @containers = []
           @enable_service_links = nil
@@ -48,6 +50,7 @@ module Metatron
           @node_selector = {}
           @persistent_volume_claims = []
           @pod_annotations = {}
+          @priority_class_name = nil
           @restart_policy = nil
           @security_context = {}
           @termination_grace_period_seconds = nil
@@ -82,6 +85,18 @@ module Metatron
           pod_annotations && !pod_annotations.empty? ? { annotations: pod_annotations } : {}
         end
 
+        def formatted_priority_class_name
+          return {} unless priority_class_name
+
+          if priority_class_name.is_a?(String)
+            { priorityClassName: priority_class_name }
+          elsif priority_class_name.is_a?(PriorityClass)
+            { priorityClassName: priority_class_name.name }
+          else
+            raise "priority_class_name must be a String or a PriorityClass"
+          end
+        end
+
         def formatted_security_context
           security_context && !security_context.empty? ? { securityContext: } : {}
         end
@@ -138,6 +153,7 @@ module Metatron
               .merge(formatted_init_containers)
               .merge(formatted_image_pull_secrets)
               .merge(formatted_node_selector)
+              .merge(formatted_priority_class_name)
               .compact
           }.compact
         end

data/lib/metatron/templates/daemon_set.rb

@@ -25,7 +25,7 @@ module Metatron
           }.merge(formatted_annotations).merge(formatted_namespace),
           spec: {
             selector: {
-              matchLabels: base_labels.merge(additional_pod_labels)
+              matchLabels: base_labels.merge(additional_pod_match_labels)
             }
           }.merge(pod_template)
         }

data/lib/metatron/templates/deployment.rb

@@ -28,7 +28,7 @@ module Metatron
             replicas:,
             strategy:,
             selector: {
-              matchLabels: base_labels.merge(additional_pod_labels)
+              matchLabels: base_labels.merge(additional_pod_match_labels)
             }
           }.merge(pod_template).compact
         }

data/lib/metatron/templates/priority_class.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Metatron
+  module Templates
+    # Template for the  PriorityClass k8s resource
+    class PriorityClass < Template
+      include Concerns::Annotated
+
+      attr_accessor :additional_labels, :description, :global_default, :value
+
+      alias global_default? global_default
+      alias globalDefault global_default
+
+      def initialize(name)
+        super
+        @api_version = "scheduling.k8s.io/v1"
+        @additional_labels = {}
+        @description = nil
+        @global_default = false
+        @value = 0
+      end
+
+      def render
+        {
+          apiVersion:,
+          kind:,
+          metadata: {
+            name:,
+            labels: base_labels.merge(additional_labels)
+          }.merge(formatted_annotations),
+          description:,
+          globalDefault:,
+          value:
+        }.compact
+      end
+    end
+  end
+end

data/lib/metatron/templates/replica_set.rb

@@ -27,7 +27,7 @@ module Metatron
           spec: {
             replicas:,
             selector: {
-              matchLabels: base_labels.merge(additional_pod_labels)
+              matchLabels: base_labels.merge(additional_pod_match_labels)
             }
           }.merge(pod_template)
         }

data/lib/metatron/templates/stateful_set.rb

@@ -38,7 +38,7 @@ module Metatron
             serviceName:,
             updateStrategy:,
             selector: {
-              matchLabels: base_labels.merge(additional_pod_labels)
+              matchLabels: base_labels.merge(additional_pod_match_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.8.8"
+  VERSION = "0.10.0"
 end

data/lib/metatron.rb

@@ -35,6 +35,7 @@ require "metatron/templates/limit_range"
 require "metatron/templates/namespace"
 require "metatron/templates/network_policy"
 require "metatron/templates/persistent_volume_claim"
+require "metatron/templates/priority_class"
 require "metatron/templates/replica_set"
 require "metatron/templates/resource_quota"
 require "metatron/templates/role"

data/metatron.gemspec

@@ -14,11 +14,12 @@ Gem::Specification.new do |spec|
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/jgnagy/metatron"
+  spec.metadata["changelog_uri"] = "https://github.com/jgnagy/metatron/blob/main/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { _1.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

data/release-please-config.json

@@ -0,0 +1,17 @@
+{
+  "bootstrap-sha": "35ed7bd080d69b5e323fa748735b4a7ea885f224",
+  "last-release-sha": "35ed7bd080d69b5e323fa748735b4a7ea885f224",
+  "packages": {
+    ".": {
+      "package-name": "metatron",
+      "changelog-path": "CHANGELOG.md",
+      "release-type": "ruby",
+      "bump-minor-pre-major": true,
+      "bump-patch-for-minor-pre-major": true,
+      "draft": false,
+      "prerelease": false,
+      "version-file": "lib/metatron/version.rb"
+    }
+  },
+  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metatron
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.10.0
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-12 00:00:00.000000000 Z
+date: 2025-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -219,11 +219,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
-- ".roxanne.yml"
+- ".release-please-manifest.json"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
@@ -255,6 +258,7 @@ files:
 - lib/metatron/templates/network_policy.rb
 - lib/metatron/templates/persistent_volume_claim.rb
 - lib/metatron/templates/pod.rb
+- lib/metatron/templates/priority_class.rb
 - lib/metatron/templates/replica_set.rb
 - lib/metatron/templates/resource_quota.rb
 - lib/metatron/templates/role.rb
@@ -265,15 +269,14 @@ files:
 - lib/metatron/templates/stateful_set.rb
 - lib/metatron/version.rb
 - metatron.gemspec
-- scripts/build.sh
-- scripts/release.sh
-- scripts/test.sh
+- release-please-config.json
 homepage: https://github.com/jgnagy/metatron
 licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/jgnagy/metatron
   source_code_uri: https://github.com/jgnagy/metatron
+  changelog_uri: https://github.com/jgnagy/metatron/blob/main/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:

data/.roxanne.yml

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

data/scripts/build.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-gem install bundler
-bundle install --jobs=4
-rm -rf pkg/*.gem
-bundle exec rake build

data/scripts/release.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-gem install bundler
-bundle install --jobs=4
-rm -rf pkg/*.gem
-bundle exec rake build
-bundle exec gem push pkg/*.gem

data/scripts/test.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-gem install bundler
-bundle install --jobs=4
-gem build ./metatron.gemspec
-bundle exec rake