additional tests

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

Author: csviri

README.md

@@ -169,6 +169,7 @@ spec:
                       protocol: TCP
                         
     - name: mutation_hook_config
+      clusterScoped: true
       # dependsOn relation means, that the resource will be reconciled only if all
       # the listed resources are already reconciled and ready (if ready post-condition is present).
       # This resource will be applied after the service and deployment are applied,

docs/reference.md

@@ -21,6 +21,8 @@ It has several attributes:
 - **`name`** - is a mandatory unique (unique also regarding related resources) attribute.
   The resource is referenced by this name from other places, typically other resource templates and `JSCondition`.
   If it is used in a `JSCondition` the `name` must be a valid JavaScript variable name.
+- **`clusterScoped`** - a flag to indicate if the resource is cluster scoped. Default value is `false`. 
+  It is mandatory to set this for cluster scoped resources.
 - **`resource`** - is the desired state of the resource applied by default using Server Side Apply. The resource is templated using
   [qute templating engine](https://quarkus.io/guides/qute-reference), other resources can be referenced from the templates, see below.  
   There is a restriction, that the child resource is namespaced, and the namespace is always the same as the namespace of the `Glue`
@@ -175,17 +177,6 @@ resources containing the same resource type.
 The templating and some of the Javascript condition is probably the most time-consuming and resource-intensive part which will 
 be continuously improved in the follow-up releases. 
 
-## Current limitations
-
-Note that none of the limitations are unsolvable, and will be continuously removed in the coming releases.
-
-1. Child resources and related resources are always namespace scoped resources, and in the same namespace as the
-   primary resource (`Glue` or the parent in the case of `GlueOperator`)
-
-2. ~~Related resource changes are not triggering the reconciliation.
-   Due to a bug in fabric8 client, after that is fixed, this is trivial to fix too:
-   https://github.com/fabric8io/kubernetes-client/issues/5729~~
-
 ## Samples
 
 1. [WebPage](https://github.com/csviri/kubernetes-glue-operator/tree/main/src/test/resources/sample/webpage) `GlueOperator`, serves a static website from the cluster.

src/main/java/io/csviri/operator/glue/customresource/glue/RelatedResourceSpec.java

@@ -10,13 +10,13 @@ public class RelatedResourceSpec {
   // name for referencing the resource from templates and conditions (not name from object metadata)
   @Required
   private String name;
+  private String namespace;
 
   @Required
   private String apiVersion;
   @Required
   private String kind;
   private boolean clusterScoped = Boolean.FALSE;
-  private String namespace;
   private List<String> resourceNames;
 
 

src/test/java/io/csviri/operator/glue/GlueTest.java

@@ -12,7 +12,10 @@
 import io.csviri.operator.glue.customresource.glue.Glue;
 import io.csviri.operator.glue.reconciler.ValidationAndErrorHandler;
 import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.api.model.Secret;
+import io.fabric8.kubernetes.client.dsl.NonDeletingOperation;
 import io.quarkus.test.junit.QuarkusTest;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -237,35 +240,76 @@ void nonUniqueNameResultsInErrorMessageOnStatus() {
     });
   }
 
+  @Test
+  void childInDifferentNamespace() {
+    Glue glue = create(TestUtils.loadGlue("/glue/ResourceInDifferentNamespace.yaml"));
+
+    await().untilAsserted(() -> {
+      var cmDifferentNS = client.configMaps().inNamespace("default")
+          .withName("configmap1");
+      var cm2 = get(ConfigMap.class, "configmap2");
+
+      assertThat(cmDifferentNS).isNotNull();
+      assertThat(cm2).isNotNull();
+    });
 
-  //
-  // @Disabled("Not supported in current version")
-  // @Test
-  // void childInDifferentNamespaceAsPrimary() {
-  // Glue w = extension
-  // .create(TestUtils.loadResoureFlow("/glue/ResourceInDifferentNamespace.yaml"));
-  //
-  // await().untilAsserted(() -> {
-  // var cmDifferentNS = extension.getKubernetesClient().configMaps().inNamespace("default")
-  // .withName("configmap1");
-  // var cm2 = extension.get(ConfigMap.class, "configmap2");
-  //
-  // assertThat(cmDifferentNS).isNotNull();
-  // assertThat(cm2).isNotNull();
-  // });
-  //
-  // extension.delete(w);
-  //
-  // await().untilAsserted(() -> {
-  // var cmDifferentNS = extension.getKubernetesClient().configMaps().inNamespace("default")
-  // .withName("configmap1");
-  // var cm2 = extension.get(ConfigMap.class, "configmap2");
-  //
-  // assertThat(cmDifferentNS).isNull();
-  // assertThat(cm2).isNull();
-  // });
-  //
-  // }
+    delete(glue);
+    await().timeout(TestUtils.GC_WAIT_TIMEOUT).untilAsserted(() -> {
+      var cmDifferentNS = client.configMaps().inNamespace("default")
+          .withName("configmap1").get();
+      var cm2 = get(ConfigMap.class, "configmap2");
+
+      assertThat(cmDifferentNS).isNull();
+      assertThat(cm2).isNull();
+    });
+  }
+
+  @Test
+  void clusterScopedChild() {
+    var glue = create(TestUtils.loadGlue("/glue/ClusterScopedChild.yaml"));
+    await().untilAsserted(() -> {
+      var ns = client.namespaces()
+          .withName("testnamespace");
+      assertThat(ns).isNotNull();
+    });
+
+    delete(glue);
+    await().timeout(TestUtils.GC_WAIT_TIMEOUT).untilAsserted(() -> {
+      var ns = client.namespaces()
+          .withName("testnamespace").get();
+      assertThat(ns).isNull();
+    });
+  }
+
+  @Test
+  void relatedResourceFromDifferentNamespace() {
+    client.resource(new ConfigMapBuilder()
+        .withMetadata(new ObjectMetaBuilder()
+            .withName("related-configmap")
+            .withNamespace("default")
+            .build())
+        .withData(Map.of("key1", "value1"))
+        .build()).createOr(NonDeletingOperation::update);
+
+    var glue = create(TestUtils.loadGlue("/glue/RelatedResourceFromDifferentNamespace.yaml"));
+
+    await().untilAsserted(() -> {
+      var cm = get(ConfigMap.class, "configmap1");
+      assertThat(cm).isNotNull();
+      assertThat(cm.getData()).containsEntry("copy-key", "value1");
+    });
+
+    delete(glue);
+    await().timeout(TestUtils.GC_WAIT_TIMEOUT).untilAsserted(() -> {
+      var cm = get(ConfigMap.class, "configmap1");
+      assertThat(cm).isNull();
+    });
+  }
+
+  @Test
+  void clusterScopedRelatedResource() {
+
+  }
 
   private List<Glue> testWorkflowList(int num) {
     List<Glue> res = new ArrayList<>();
@@ -278,4 +322,6 @@ private List<Glue> testWorkflowList(int num) {
     return res;
   }
 
+
+
 }

src/test/resources/glue/ClusterScopedChild.yaml

@@ -0,0 +1,18 @@
+apiVersion: io.csviri.operator.glue/v1beta1
+kind: Glue
+metadata:
+  name: "testglue"
+spec:
+  childResources:
+    - name: namespace
+      clusterScoped: true
+      resource:
+        apiVersion: v1
+        kind: Namespace
+        metadata:
+          name: "testnamespace"
+
+
+
+
+

src/test/resources/glue/RelatedResourceFromDifferentNamespace.yaml

@@ -0,0 +1,22 @@
+apiVersion: io.csviri.operator.glue/v1beta1
+kind: Glue
+metadata:
+  name: "testglue"
+spec:
+  childResources:
+    - name: configMap
+      resource:
+        apiVersion: v1
+        kind: ConfigMap
+        metadata:
+          name: "configmap1"
+        data:
+          copy-key: "{related.data.key1}"
+  relatedResources:
+    - name: related
+      apiVersion: v1
+      kind: ConfigMap
+      namespace: default
+      resourceNames: ["related-configmap"]
+
+

src/test/resources/glue/ResourceInDifferentNamespace.yaml

@@ -10,6 +10,7 @@ spec:
         kind: ConfigMap
         metadata:
           name: "configmap1"
+          namespace: default
         data:
           key: "v1"
     - name: configMap2
@@ -20,7 +21,3 @@ spec:
           name: "configmap2"
         data:
           key: "v2"
-
-
-
-

src/test/resources/sample/mutation/mutation.glue.yaml

@@ -74,6 +74,7 @@ spec:
                     optional: false
                     secretName: tls-secret
     - name: mutation_hook_config
+      clusterScoped: true
       dependsOn:
         - deployment
         - service