fix: test / impl

Signed-off-by: Attila Mészáros <csviri@gmail.com>
csviri · Apr 5, 2024 · 1ffb199 · 1ffb199
1 parent 2a81a1d
commit 1ffb199
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 16 deletions.
diff --git a/...ceglue/conditions/PodsReadyCondition.java → ...sourceglue/conditions/ReadyCondition.java b/...ceglue/conditions/PodsReadyCondition.java → ...sourceglue/conditions/ReadyCondition.java
@@ -7,13 +7,13 @@
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;
 
-public class PodsReadyCondition<R extends HasMetadata> implements Condition<R, Glue> {
+public class ReadyCondition<R extends HasMetadata> implements Condition<R, Glue> {
 
   private final Readiness readiness = Readiness.getInstance();
 
   private final boolean negated;
 
-  public PodsReadyCondition(boolean negated) {
+  public ReadyCondition(boolean negated) {
     this.negated = negated;
   }
 

diff --git a/...ain/java/io/csviri/operator/resourceglue/customresource/glue/condition/ConditionSpec.java b/...ain/java/io/csviri/operator/resourceglue/customresource/glue/condition/ConditionSpec.java
@@ -7,7 +7,7 @@
     use = JsonTypeInfo.Id.NAME,
     property = "type")
 @JsonSubTypes({
-    @JsonSubTypes.Type(value = PodsReadyConditionSpec.class, name = "PodsReady"),
+    @JsonSubTypes.Type(value = ReadyConditionSpec.class, name = "ReadyCondition"),
     @JsonSubTypes.Type(value = JavaScriptConditionSpec.class, name = "JSCondition")
 })
 public class ConditionSpec {

diff --git a/...lue/condition/PodsReadyConditionSpec.java → ...ce/glue/condition/ReadyConditionSpec.java b/...lue/condition/PodsReadyConditionSpec.java → ...ce/glue/condition/ReadyConditionSpec.java
@@ -1,14 +1,14 @@
 package io.csviri.operator.resourceglue.customresource.glue.condition;
 
-public class PodsReadyConditionSpec extends ConditionSpec {
+public class ReadyConditionSpec extends ConditionSpec {
 
   private final boolean negated;
 
-  public PodsReadyConditionSpec(boolean negated) {
+  public ReadyConditionSpec(boolean negated) {
     this.negated = negated;
   }
 
-  public PodsReadyConditionSpec() {
+  public ReadyConditionSpec() {
     this(false);
   }
 

diff --git a/src/main/java/io/csviri/operator/resourceglue/reconciler/glue/GlueReconciler.java b/src/main/java/io/csviri/operator/resourceglue/reconciler/glue/GlueReconciler.java
@@ -7,12 +7,12 @@
 
 import io.csviri.operator.resourceglue.Utils;
 import io.csviri.operator.resourceglue.conditions.JavaScripCondition;
-import io.csviri.operator.resourceglue.conditions.PodsReadyCondition;
+import io.csviri.operator.resourceglue.conditions.ReadyCondition;
 import io.csviri.operator.resourceglue.customresource.glue.DependentResourceSpec;
 import io.csviri.operator.resourceglue.customresource.glue.Glue;
 import io.csviri.operator.resourceglue.customresource.glue.condition.ConditionSpec;
 import io.csviri.operator.resourceglue.customresource.glue.condition.JavaScriptConditionSpec;
-import io.csviri.operator.resourceglue.customresource.glue.condition.PodsReadyConditionSpec;
+import io.csviri.operator.resourceglue.customresource.glue.condition.ReadyConditionSpec;
 import io.csviri.operator.resourceglue.dependent.GCGenericDependentResource;
 import io.csviri.operator.resourceglue.dependent.GenericDependentResource;
 import io.csviri.operator.resourceglue.dependent.GenericResourceDiscriminator;
@@ -148,10 +148,11 @@ private void createAndAddDependentToWorkflow(Glue primary, Context<Glue> context
       Map<String, GenericDependentResource> genericDependentResourceMap,
       WorkflowBuilder<Glue> builder, boolean leafDependent) {
 
+    // todo test processing ns not as template
     // todo test processing ns as template
     // name can reference related resources todo doc
     var targetNamespace = Utils.getNamespace(spec).map(ns -> genericTemplateHandler
-        .processTemplate(Utils.getName(spec), primary, context));
+        .processTemplate(ns, primary, context));
     var resourceInSameNamespaceAsPrimary =
         targetNamespace.map(n -> n.trim().equals(primary.getMetadata().getNamespace().trim()))
             .orElse(true);
@@ -197,8 +198,8 @@ private static GenericDependentResource createDependentResource(DependentResourc
 
   @SuppressWarnings({"rawtypes"})
   private Condition toCondition(ConditionSpec condition) {
-    if (condition instanceof PodsReadyConditionSpec readyConditionSpec) {
-      return new PodsReadyCondition(readyConditionSpec.isNegated());
+    if (condition instanceof ReadyConditionSpec readyConditionSpec) {
+      return new ReadyCondition(readyConditionSpec.isNegated());
     } else if (condition instanceof JavaScriptConditionSpec jsCondition) {
       return new JavaScripCondition(jsCondition.getScript());
     }

diff --git a/src/test/resources/resourceglue/ResourceInDifferentNamespace.yaml b/src/test/resources/resourceglue/ResourceInDifferentNamespace.yaml
@@ -10,7 +10,6 @@ spec:
         kind: ConfigMap
         metadata:
           name: "configmap1"
-          namespace: default
         data:
           key: "v1"
     - name: configMap2

diff --git a/src/test/resources/sample/mutation/mutation.glue.yaml b/src/test/resources/sample/mutation/mutation.glue.yaml
@@ -10,7 +10,6 @@ spec:
         kind: Service
         metadata:
           name: pod-mutating-hook
-          namespace: default
         spec:
           ports:
             - name: https
@@ -23,13 +22,12 @@ spec:
           type: NodePort
     - name: deployment
       readyPostCondition:
-        type: PodsReady
+        type: ReadyCondition
       resource:
         apiVersion: apps/v1
         kind: Deployment
         metadata:
           name: pod-mutating-hook
-          namespace: default
         spec:
           replicas: 1
           selector:
@@ -86,7 +84,6 @@ spec:
           annotations:
             cert-manager.io/inject-ca-from: default/sample-pod-mutating-webhook
           name: pod-mutating-webhook
-          namespace: default
         webhooks:
           - admissionReviewVersions:
               - v1