kube_schema 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9946ce747cc72c7fd6ca85a8427daf711844160d0fd932e2ee0adaba687f4982
-  data.tar.gz: 3b4843e1165f6ac2a61ded6415851d80a9515b4e7f0a533be9940560e55446ca
+  metadata.gz: 651ce0da8cfdeb3d0811b98c5740647fbb745730696ce780b4f12886ca86c60f
+  data.tar.gz: 46dbc8243c5c1702ea6d8a2dada15a6716369acf80e6f77a7c7edd44e789ec44
 SHA512:
-  metadata.gz: f369dd4d71f53dc8ce4ad7b310c992283cabda559d0f493017400418043f69d5f340b6f8642b6e34a61db9610be206defdb5deeb6ac01f5f9e1f97f2dd3665bf
-  data.tar.gz: 52cdb3057cd53c1ae36c1be4115d03ff353ec39707bf07f11ce7d7c0732de8c56a2ff2c5f5be8bfe0f244bef4fea82d54f33b407909bb61a9e9c5da0fb3884e3
+  metadata.gz: b1d2bd00725e5ec1f732fb9b5251db0463ba78a91957f8d6f657b9617472b215a1f86469d69c14c8fd9a0b1bd29b274059f70d28954091e8c59e74731d7c6ad7
+  data.tar.gz: 3a641891343ff4ca5b11e6c9b7ab41d0e7d746f6f9e08d37cfa8844a8fc0272d0d25f3830a7b9f254d280568d957ad8ba595cda9f443c9d06891659c101bffbd

data/lib/kube/schema/instance.rb

@@ -66,6 +66,12 @@ module Kube
                 "\nExpected \"group/version/kind\" or \"version/kind\"."
             end
 
+            # Custom schemas take precedence on full-GVK lookups too.
+            custom = find_custom_entry_by_gvk(group, version, kind)
+            if custom
+              return build_resource_class(custom[:schema], custom[:defaults])
+            end
+
             entry = find_gvk_entry_by_full_gvk(group, version, kind)
           else
             # Kind-only lookup — custom schemas take precedence.
@@ -92,7 +98,8 @@ module Kube
       #
       # @return [Array<String>] sorted kind names
       def list_resources
-        (gvk_index.keys + Schema.custom_schemas.keys).uniq.sort
+        custom_kinds = Schema.custom_schemas.values.map { |v| v[:defaults]["kind"] }
+        (gvk_index.keys + custom_kinds).uniq.sort
       end
 
       # Look up a sub-spec definition by short name (e.g. "Container",
@@ -243,19 +250,25 @@ module Kube
           end
         end
 
-        # Find a custom schema entry by kind (case-insensitive).
+        # Find a custom schema entry by kind (case-insensitive). The registry
+        # is keyed by full GVK, so match on each entry's recorded kind. When
+        # several groups register the same kind, the first registered wins.
         # Returns the { schema:, defaults: } hash or nil.
         def find_custom_entry(kind)
           registry = Schema.custom_schemas
-          return registry[kind] if registry.key?(kind)
-
-          registry.each do |k, v|
-            return v if k.downcase == kind.downcase
-          end
+          registry.each_value { |v| return v if v[:defaults]["kind"] == kind }
+          registry.each_value { |v| return v if v[:defaults]["kind"].casecmp?(kind) }
 
           nil
         end
 
+        # Find a custom schema entry by exact group, version, and kind.
+        # Returns the { schema:, defaults: } hash or nil.
+        def find_custom_entry_by_gvk(group, version, kind)
+          api_version = group.empty? ? version : "#{group}/#{version}"
+          Schema.custom_schemas["#{api_version}/#{kind}"]
+        end
+
         # Build a Resource subclass from a JSONSchemer instance and defaults hash.
         def build_resource_class(schema_instance, defaults)
           Class.new(::Kube::Schema::Resource) do

data/lib/kube/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Kube
   module Schema
-    VERSION = "1.9.0"
+    VERSION = "1.9.1"
   end
 end

data/lib/kube/schema.rb

@@ -74,7 +74,12 @@ module Kube
               "schema must be a Hash, a JSON string, or a file path — got #{schema.class}"
           end
 
-        @custom_schemas[kind] = {
+        # Key by full GVK ("group/version/Kind") so a registered CRD resolves
+        # on fully-qualified lookups (e.g. the api_version/kind path that
+        # Resource#rebuild reconstructs), not just kind-only lookups. Keying by
+        # bare kind also collided when two CRDs shared a kind across groups.
+        key = api_version ? "#{api_version}/#{kind}" : kind
+        @custom_schemas[key] = {
           schema: JSONSchemer.schema(parsed),
           defaults: { "apiVersion" => api_version, "kind" => kind }.freeze
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kube_schema
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Nathan K