migrate tests

Signed-off-by: Attila Mészáros <csviri@gmail.com>
csviri · Mar 29, 2024 · 7b813b5 · 7b813b5
1 parent 74cb4b7
commit 7b813b5
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,6 @@
     <fabric8-client.version>6.11.0</fabric8-client.version>
     <graalvm.version>24.0.0</graalvm.version>
     <mokito.version>5.11.0</mokito.version>
-    <mustache.version>0.9.11</mustache.version>
     <qosdk.version>6.6.7</qosdk.version>
     <assertj.version>3.25.3</assertj.version>
     <spotless.version>2.43.0</spotless.version>
@@ -103,11 +102,6 @@
       <type>pom</type>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>com.github.spullara.mustache.java</groupId>
-      <artifactId>compiler</artifactId>
-      <version>${mustache.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk18on</artifactId>

diff --git a/src/test/resources/resourceglue/MultiNameRelatedResource.yaml b/src/test/resources/resourceglue/MultiNameRelatedResource.yaml
@@ -11,8 +11,8 @@ spec:
         metadata:
           name: cm1
         data:
-          key1: "{{{secrets#test-secret1.data.key}}}"
-          key2: "{{{secrets#test-secret2.data.key}}}"
+          key1: "{secrets#test-secret1.data.key}"
+          key2: "{secrets#test-secret2.data.key}"
 
   relatedResources:
     - name: secrets

diff --git a/src/test/resources/resourceglue/RelatedResourceSimpleWithCondition.yaml b/src/test/resources/resourceglue/RelatedResourceSimpleWithCondition.yaml
@@ -11,7 +11,7 @@ spec:
         metadata:
           name: cm1
         data:
-          key: "{{{secret1.data.key}}}"
+          key: "{secret1.data.key}"
     - name: configMap2
       resource:
         apiVersion: v1

diff --git a/src/test/resources/resourceglue/RelatesResourceSameType.yaml b/src/test/resources/resourceglue/RelatesResourceSameType.yaml
@@ -11,7 +11,7 @@ spec:
         metadata:
           name: cm1
         data:
-          key: "{{{related-configmap.data.key}}}"
+          key: "{related-configmap.data.key}"
   relatedResources:
     - name: related-configmap
       apiVersion: v1

diff --git a/src/test/resources/resourceglue/ResourceTemplate.yaml b/src/test/resources/resourceglue/ResourceTemplate.yaml
@@ -22,4 +22,4 @@ spec:
           name: templconfigmap2
         data:          
           key: "v2"
-          valueFromCM1: "{{configMap1.data.key}}"
+          valueFromCM1: "{configMap1.data.key}"
diff --git a/src/test/resources/resourceglue/TemplateForConcurrency.yaml b/src/test/resources/resourceglue/TemplateForConcurrency.yaml
@@ -9,7 +9,7 @@ spec:
         apiVersion: v1
         kind: ConfigMap
         metadata:
-          name: "{{glueMetadata.name}}-1"
+          name: "{glueMetadata.name}-1"
         data:
           key: "value1"
     - name: configMap2
@@ -19,10 +19,10 @@ spec:
         apiVersion: v1
         kind: ConfigMap
         metadata:
-          name: "{{glueMetadata.name}}-2"
+          name: "{glueMetadata.name}-2"
         data:
           key: "v2"
-          valueFromCM1: "{{configMap1.data.key}}"
+          valueFromCM1: "{configMap1.data.key}"
 
 
 
diff --git a/src/test/resources/resourceglue/Templating.yaml b/src/test/resources/resourceglue/Templating.yaml
@@ -22,7 +22,7 @@ spec:
           name: templconfigmap2
         data:
           key: "v2"
-          valueFromCM1: "{{configMap1.data.key}}"
+          valueFromCM1: "{configMap1.data.key}"
 
 
 
diff --git a/src/test/resources/resourceglueoperator/Concurrency.yaml b/src/test/resources/resourceglueoperator/Concurrency.yaml
@@ -12,6 +12,6 @@ spec:
         apiVersion: v1
         kind: ConfigMap
         metadata:
-          name: "{{parent.metadata.name}}"
+          name: "{parent.metadata.name}"
         data:
-          key: "{{parent.spec.value}}"
+          key: "{parent.spec.value}"
diff --git a/src/test/resources/resourceglueoperator/Concurrency2.yaml b/src/test/resources/resourceglueoperator/Concurrency2.yaml
@@ -12,6 +12,6 @@ spec:
         apiVersion: v1
         kind: ConfigMap
         metadata:
-          name: "{{parent.metadata.name}}"
+          name: "{parent.metadata.name}"
         data:
-          key: "{{parent.spec.value}}"
+          key: "{parent.spec.value}"
diff --git a/src/test/resources/resourceglueoperator/Templating.yaml b/src/test/resources/resourceglueoperator/Templating.yaml
@@ -12,6 +12,6 @@ spec:
         apiVersion: v1
         kind: ConfigMap
         metadata:
-          name: "{{parent.metadata.name}}"
+          name: "{parent.metadata.name}"
         data:
-          key: "{{parent.spec.value}}"
+          key: "{parent.spec.value}"