Start of fixes for non unique kinds

Author: dturn

lib/krane/kubernetes_resource.rb

@@ -48,11 +48,11 @@ def build(namespace: nil, context:, definition:, logger:, statsd_tags:, crd: nil
         validate_definition_essentials(definition)
         opts = { namespace: namespace, context: context, definition: definition, logger: logger,
                  statsd_tags: statsd_tags }
-        if (klass = class_for_kind(definition["kind"]))
-          return klass.new(**opts)
-        end
-        if crd
+
+        if crd && definition['apiVersion'].start_with?("#{crd.group}/")
           CustomResource.new(crd: crd, **opts)
+        elsif (klass = class_for_kind(definition["kind"]))
+          klass.new(**opts)
         else
           type = definition["kind"]
           inst = new(**opts)
@@ -164,12 +164,16 @@ def file_path
     end
 
     def sync(cache)
-      @instance_data = cache.get_instance(kubectl_resource_type, name, raise_if_not_found: true)
+      @instance_data = cache.get_instance(sync_group_kind, name, raise_if_not_found: true)
     rescue Krane::Kubectl::ResourceNotFoundError
       @disappeared = true if deploy_started?
       @instance_data = {}
     end
 
+    def sync_group_kind
+      "#{kubectl_resource_type}.#{group}"
+    end
+
     def after_sync
     end
 

lib/krane/kubernetes_resource/custom_resource_definition.rb

@@ -87,6 +87,11 @@ def validate_rollout_conditions
       @rollout_conditions_validated = true
     end
 
+    def sync_group_kind
+      real_group = @definition.dig("apiVersion").split("/").first
+      "#{self.class.kind}.#{real_group}"
+    end
+
     private
 
     def names_accepted_condition

lib/krane/resource_cache.rb

@@ -36,9 +36,10 @@ def get_all(kind, selector = nil)
       []
     end
 
+    # TODO: I've broken sync_dependencies
     def prewarm(resources)
       sync_dependencies = resources.flat_map { |r| r.class.const_get(:SYNC_DEPENDENCIES) }
-      kinds = (resources.map(&:type) + sync_dependencies).uniq
+      kinds = resources.map(&:sync_group_kind).uniq # sync_dependencies).uniq
       Krane::Concurrency.split_across_threads(kinds, max_threads: kinds.count) { |kind| get_all(kind) }
     end
 
@@ -56,8 +57,9 @@ def use_or_populate_cache(kind)
     end
 
     def fetch_by_kind(kind)
-      resource_class = KubernetesResource.class_for_kind(kind)
-      global_kind = @task_config.global_kinds.map(&:downcase).include?(kind.downcase)
+      kind_only = kind.split(".").first.downcase # Busted for non unique kinds...
+      resource_class = KubernetesResource.class_for_kind(kind_only)
+      global_kind = @task_config.global_kinds.map(&:downcase).include?(kind_only)
       output_is_sensitive = resource_class.nil? ? false : resource_class::SENSITIVE_TEMPLATE_CONTENT
       raw_json, _, st = @kubectl.run("get", kind, "--chunk-size=0", attempts: 5, output: "json",
          output_is_sensitive: output_is_sensitive, use_namespace: !global_kind)