metatron 0.9.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 384d0a3e91cc449b09e5e1ccd514e966e0bea42603da9f01a8498ac25ce943aa
-  data.tar.gz: f50cf239982f715745308a39ce3027b413ca105b4e41ffc33c097c3489c5f5e4
+  metadata.gz: bfe544a98c67ba6ae97f9e09fac9a58483c169fd067f89484b2d454f2d290d43
+  data.tar.gz: b40a06690c8eaf0f226e82ebe17a24916724e178bd8b63765dfed4a9ee9f8762
 SHA512:
-  metadata.gz: abb52677bdcf1dd2ed1365af61d02861edbed89b04235db5f4c5fb980c2bb44cfca95a868805f1b84f495b4a5650977c8ca4bb44dc3fd384f0235391decfcf18
-  data.tar.gz: f058f18da99307cac67532bba657fa470f934c83cdf27e2d97cb589d8aa6a1601989c32bb107686ed940ce4189769ea7816fd1c187575915c8bedb4e216c49f6
+  metadata.gz: cfe09b2799cef530b00ce400f56d880236ef7c263806f81300a97139da739c57358a3ea5708f69c230c14d554a341b4d7f10c88536f112a85a18d52799d7f892
+  data.tar.gz: 2d6aa1b21ead7c64f227d9c819164fa07a06c0a7ac312981b73a5d0c4c83915d01d72258507285ed1468287471eadda77d697dca340a4c4c9b7aedb9fde0af16

data/.github/workflows/ci.yml

@@ -2,13 +2,6 @@ name: CI
 
 on:
   pull_request:
-  push:
-    branches: [ "main" ]
-
-permissions:
-  contents: write
-  pull-requests: write
-  id-token: write
 
 jobs:
   lint:
@@ -59,27 +52,3 @@ jobs:
       
       - name: Run tests
         run: bundle exec rake spec
-
-  release:
-    runs-on: ubuntu-latest
-    needs: [ lint, yard, test ]
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-    steps:
-      - uses: googleapis/release-please-action@v4
-        id: release
-        with:
-          # The token to use for authentication
-          token: ${{ secrets.AUTO_RELEASE_TOKEN }}
-
-      - uses: actions/checkout@v4
-        if: ${{ steps.release.outputs.release_created }}
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        if: ${{ steps.release.outputs.release_created }}
-        with:
-          bundler-cache: true
-          ruby-version: .ruby-version
-
-      # Release
-      - uses: rubygems/release-gem@v1
-        if: ${{ steps.release.outputs.release_created }}

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

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

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [0.10.1](https://github.com/jgnagy/metatron/compare/metatron/v0.10.0...metatron/v0.10.1) (2025-03-21)
+
+
+### Features
+
+* **misc:** allow ping controller usage as class ([60048f3](https://github.com/jgnagy/metatron/commit/60048f3905959bf4193254e9e3f3800298cbc494))
+
+## [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)
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metatron (0.9.0)
+    metatron (0.10.1)
       json (~> 2.6)
       rack (>= 2.2.8, < 4)
 
@@ -15,7 +15,7 @@ GEM
     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)
@@ -23,9 +23,9 @@ GEM
     language_server-protocol (3.17.0.4)
     lint_roller (1.1.0)
     logger (1.6.6)
-    nokogiri (1.18.2-arm64-darwin)
+    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)
@@ -34,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)

data/README.md

@@ -2,8 +2,12 @@
 
 Metatron is a Ruby library for creating [Metacontroller](https://metacontroller.github.io/metacontroller/)-based custom Kubernetes controllers.
 
-The intention is to make it as easy as possible to use Ruby to manage [custom resources](https://kubernetes.io/docs/concepts/api-extension/custom-resources/) within your Kubernetes infrastructure. No Golang required!
+The intention is to make it as easy as possible to use Ruby to manage [custom resources](https://kubernetes.io/docs/concepts/api-extension/custom-resources/) within your Kubernetes infrastructure. No Golang required! Use simple, Rack-based controllers to provide the logic for your custom resources. Metatron templates provide a most Kubernetes boilerplate code for you, so you can focus on the logic that enables your custom resources to do what you need them to do.
 
 For more information, see the [Metatron Wiki on GitHub](https://github.com/jgnagy/metatron/wiki)!
 
 For help on how to get started, take a look at the [User Guide](https://github.com/jgnagy/metatron/wiki/User-Guide) in the Wiki!
+
+## Contributing
+
+If you're interested in contributing to Metatron, please see the [Contributing Guide](CONTRIBUTING.md) in the repository! Be sure to check out the [Code of Conduct](CODE_OF_CONDUCT.md) as well!

data/lib/metatron/controllers/ping.rb

@@ -6,6 +6,10 @@ module Metatron
     class Ping
       RESPONSE = { status: "up" }.to_json
 
+      class << self
+        def call(env) = new.call(env)
+      end
+
       def call(env)
         req = Rack::Request.new(env)
 

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,10 +9,10 @@ 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,
+                          :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
@@ -41,6 +41,7 @@ module Metatron
 
         def pod_producer_initialize
           @additional_pod_labels = {}
+          @additional_pod_match_labels = {}
           @affinity = {}
           @containers = []
           @enable_service_links = nil

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/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.9.0"
+  VERSION = "0.10.1"
 end

data/release-please-config.json

@@ -6,8 +6,8 @@
       "package-name": "metatron",
       "changelog-path": "CHANGELOG.md",
       "release-type": "ruby",
-      "bump-minor-pre-major": false,
-      "bump-patch-for-minor-pre-major": false,
+      "bump-minor-pre-major": true,
+      "bump-patch-for-minor-pre-major": true,
       "draft": false,
       "prerelease": false,
       "version-file": "lib/metatron/version.rb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metatron
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-17 00:00:00.000000000 Z
+date: 2025-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -220,6 +220,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/ci.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".release-please-manifest.json"
 - ".rspec"