progress

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

src/main/java/io/csviri/operator/glue/Utils.java

@@ -31,16 +31,13 @@ public static Map<String, GenericKubernetesResource> getActualResourcesByNameInW
     Map<String, GenericKubernetesResource> res = new HashMap<>();
     secondaryResources.forEach(sr -> {
       var dependentSpec = glue.getSpec().getChildResources().stream()
-          .filter(r -> Utils.getApiVersion(r).equals(sr.getApiVersion())
-              && Utils.getKind(r).equals(sr.getKind())
+          .filter(r ->
       // comparing the name from annotation since the resource name might be templated in spec
       // therefore "Utils.getName(relatedResourceSpec).equals(sr.getMetadata().getName())" would not
       // work
-              && r.getName()
-                  .equals(sr.getMetadata().getAnnotations().get(DEPENDENT_NAME_ANNOTATION_KEY))
-      // namespace not compared here, it should be done it is just not trivial, now it is limited to
-      // have one kind of resource in the workflow with the same resource name
-      ).findFirst();
+      r.getName()
+          .equals(sr.getMetadata().getAnnotations().get(DEPENDENT_NAME_ANNOTATION_KEY)))
+          .findFirst();
       dependentSpec.ifPresent(spec -> res.put(spec.getName(), sr));
     });
 
@@ -70,8 +67,9 @@ public static Map<String, GenericKubernetesResource> getRelatedResources(Glue gl
         (InformerEventSource<GenericKubernetesResource, Glue>) context
             .eventSourceRetriever()
             .getResourceEventSourceFor(GenericKubernetesResource.class, gvk.toString());
-    var namespace =
-        relatedResourceSpec.getNamespace() == null ? glue.getMetadata().getNamespace()
+
+    var namespace = relatedResourceSpec.isClusterScoped() ? null
+        : relatedResourceSpec.getNamespace() == null ? glue.getMetadata().getNamespace()
             : relatedResourceSpec.getNamespace();
 
     var res = new HashMap<String, GenericKubernetesResource>();

src/main/java/io/csviri/operator/glue/dependent/GCGenericDependentResource.java

@@ -7,11 +7,12 @@
 public class GCGenericDependentResource extends GenericDependentResource
     implements GarbageCollected<Glue> {
 
-  public GCGenericDependentResource(GenericKubernetesResource desired, String name) {
-    super(desired, name);
+  public GCGenericDependentResource(GenericKubernetesResource desired, String name,
+      boolean clusterScoped) {
+    super(desired, name, clusterScoped);
   }
 
-  public GCGenericDependentResource(String desiredTemplate, String name) {
-    super(desiredTemplate, name);
+  public GCGenericDependentResource(String desiredTemplate, String name, boolean clusterScoped) {
+    super(desiredTemplate, name, clusterScoped);
   }
 }

src/main/java/io/csviri/operator/glue/dependent/GenericDependentResource.java

@@ -22,23 +22,27 @@ public class GenericDependentResource
   private final GenericKubernetesResource desired;
   private final String desiredTemplate;
   private final String name;
+  private final boolean clusterScoped;
 
   // optimize share between instances
   private final GenericTemplateHandler genericTemplateHandler = new GenericTemplateHandler();
 
-  public GenericDependentResource(GenericKubernetesResource desired, String name) {
+  public GenericDependentResource(GenericKubernetesResource desired, String name,
+      boolean clusterScoped) {
     super(new GroupVersionKind(desired.getApiVersion(), desired.getKind()));
     this.desired = desired;
     this.desiredTemplate = null;
     this.name = name;
+    this.clusterScoped = clusterScoped;
   }
 
-  public GenericDependentResource(String desiredTemplate, String name) {
+  public GenericDependentResource(String desiredTemplate, String name, boolean clusterScoped) {
     super(new GroupVersionKind(Utils.getApiVersionFromTemplate(desiredTemplate),
         Utils.getKindFromTemplate(desiredTemplate)));
     this.name = name;
     this.desiredTemplate = desiredTemplate;
     this.desired = null;
+    this.clusterScoped = clusterScoped;
   }
 
   @Override
@@ -53,8 +57,7 @@ protected GenericKubernetesResource desired(Glue primary,
     resultDesired.getMetadata().getAnnotations()
         .put(GlueReconciler.DEPENDENT_NAME_ANNOTATION_KEY, name);
 
-    // set only for cluster scoped when detection is ready
-    if (resultDesired.getMetadata().getNamespace() == null) {
+    if (resultDesired.getMetadata().getNamespace() == null && !clusterScoped) {
       resultDesired.getMetadata().setNamespace(primary.getMetadata().getNamespace());
     }
     return resultDesired;

src/main/java/io/csviri/operator/glue/reconciler/glue/GlueReconciler.java

@@ -202,14 +202,19 @@ private void createAndAddDependentToWorkflow(Glue primary, Context<Glue> context
 
   private static GenericDependentResource createDependentResource(DependentResourceSpec spec,
       boolean leafDependent, Boolean resourceInSameNamespaceAsPrimary) {
-    if (leafDependent && resourceInSameNamespaceAsPrimary) {
+
+    if (leafDependent && resourceInSameNamespaceAsPrimary && !spec.isClusterScoped()) {
       return spec.getResourceTemplate() != null
-          ? new GCGenericDependentResource(spec.getResourceTemplate(), spec.getName())
-          : new GCGenericDependentResource(spec.getResource(), spec.getName());
+          ? new GCGenericDependentResource(spec.getResourceTemplate(), spec.getName(),
+              spec.isClusterScoped())
+          : new GCGenericDependentResource(spec.getResource(), spec.getName(),
+              spec.isClusterScoped());
     } else {
       return spec.getResourceTemplate() != null
-          ? new GenericDependentResource(spec.getResourceTemplate(), spec.getName())
-          : new GenericDependentResource(spec.getResource(), spec.getName());
+          ? new GenericDependentResource(spec.getResourceTemplate(), spec.getName(),
+              spec.isClusterScoped())
+          : new GenericDependentResource(spec.getResource(), spec.getName(),
+              spec.isClusterScoped());
     }
   }