fix: Remove templating from composition file

Author: ishan-karmakar

tests/application-upgrade/resource-composition-localchart.yaml

@@ -1,7 +1,7 @@
 apiVersion: workflows.kubeplus/v1alpha1
 kind: ResourceComposition
 metadata:
-  name: {{ name }}
+  name: basic-web-app-service-composition
 spec:
   newResource:
     chartName: basicwebapp

tests/application-upgrade/tenant1.yaml

@@ -1,6 +1,6 @@
 apiVersion: platformapi.kubeplus/v1alpha1
 kind: WebAppService
 metadata:
-  name: {{ name }}
+  name: bwa-tenant1
 spec:
   nodeName: minikube

tests/resource-quota/wordpress-service-composition-1.yaml

@@ -1,7 +1,7 @@
 apiVersion: workflows.kubeplus/v1alpha1
 kind: ResourceComposition
 metadata:
-  name: {{ name }}
+  name: wordpress-service-composition
 spec:
   # newResource defines the new CRD to be installed define a workflow.
   newResource:

tests/resource-quota/wordpress-service-composition.yaml

@@ -1,7 +1,7 @@
 apiVersion: workflows.kubeplus/v1alpha1
 kind: ResourceComposition
 metadata:
-  name: {{ name }}
+  name: wordpress-service-composition
 spec:
   # newResource defines the new CRD to be installed define a workflow.
   newResource:

tests/storage-isolation/wordpress-service-composition.yaml

@@ -1,7 +1,7 @@
 apiVersion: workflows.kubeplus/v1alpha1
 kind: ResourceComposition
 metadata:
-  name: {{ name }}
+  name: wordpress-service-composition-storage
 spec:
   # newResource defines the new CRD to be installed define a workflow.
   newResource:

tests/template-manifests/hello-world-hs1-replicas-2.yaml

@@ -1,7 +1,7 @@
 apiVersion: platformapi.kubeplus/v1alpha1
 kind: HelloWorldService
 metadata:
-  name: hs1
+  name: {{ name }}
 spec:
   greeting: Hello hello hello
   replicas: 2 

tests/tests.py

@@ -65,16 +65,16 @@ def _process_template(self, file):
         with open(file) as file_in, NamedTemporaryFile(mode='w+', suffix='.yaml', delete=False) as out:
             template = Template(file_in.read())
             out.write(template.render(name=name))
-            self.tmp_files.append(out.name)
-            return name, out.name
+            file_path = out.name
+            self.tmp_files.append(file_path)
+            return name, file_path
 
     def test_create_res_comp_for_chart_with_ns(self):
         if not TestKubePlus._is_kubeplus_running():
             print("KubePlus is not running. Deploy KubePlus and then run tests")
             sys.exit(0)
 
-        _, file = TestKubePlus._process_template("wordpress-service-composition-chart-withns.yaml")
-        cmd = f"kubectl create -f {file} --kubeconfig=../kubeplus-saas-provider.json"
+        cmd = "kubectl create -f wordpress-service-composition-chart-withns.yaml --kubeconfig=../kubeplus-saas-provider.json"
         out, err = TestKubePlus.run_command(cmd)
         # print("Out:" + out)
         # print("Err:" + err)
@@ -88,8 +88,7 @@ def test_create_res_comp_for_chart_with_shared_storage(self):
         cmd = "kubectl create -f storage-class-fast.yaml"
         TestKubePlus.run_command(cmd)
 
-        _, file = TestKubePlus._process_template("storage-isolation/wordpress-service-composition.yaml")
-        cmd = f"kubectl create -f {file} --kubeconfig=../kubeplus-saas-provider.json"
+        cmd = "kubectl create -f storage-isolation/wordpress-service-composition.yaml --kubeconfig=../kubeplus-saas-provider.json"
         out, err = TestKubePlus.run_command(cmd)
         # print("Out:" + out)
         # print("Err:" + err)
@@ -103,8 +102,7 @@ def test_create_res_comp_with_incomplete_resource_quota(self):
             print("KubePlus is not running. Deploy KubePlus and then run tests")
             sys.exit(0)
 
-        _, file = TestKubePlus._process_template("resource-quota/wordpress-service-composition-1.yaml")
-        cmd = f"kubectl create -f {file} --kubeconfig=../kubeplus-saas-provider.json"
+        cmd = "kubectl create -f resource-quota/wordpress-service-composition-1.yaml --kubeconfig=../kubeplus-saas-provider.json"
         out, err = TestKubePlus.run_command(cmd)
         # print("Out:" + out)
         # print("Err:" + err)
@@ -174,7 +172,6 @@ def test_license_plugin(self):
         out, err = TestKubePlus.run_command(cmd)
 
 
-    # @unittest.skip("Skipping application update test")
     def test_application_update(self):
         if not TestKubePlus._is_kubeplus_running():
             print("KubePlus is not running. Deploy KubePlus and then run tests")
@@ -193,7 +190,7 @@ def test_application_update(self):
 
         cmd = "kubectl upload chart ../examples/multitenancy/hello-world/hello-world-chart-0.0.3.tgz ../kubeplus-saas-provider.json"
         out, err = TestKubePlus.run_command(cmd)
-        cmd = f"kubectl create -f ../examples/multitenancy/hello-world/hello-world-service-composition-localchart.yaml --kubeconfig=../kubeplus-saas-provider.json"
+        cmd = "kubectl create -f ../examples/multitenancy/hello-world/hello-world-service-composition-localchart.yaml --kubeconfig=../kubeplus-saas-provider.json"
         out, err = TestKubePlus.run_command(cmd)
 
         crd = "helloworldservices.platformapi.kubeplus"
@@ -313,9 +310,8 @@ def cleanup():
         TestKubePlus.run_command(cmd)
 
         # create API
-        _, file = TestKubePlus._process_template("application-upgrade/resource-composition-localchart.yaml")
         namespace, tenant_file = TestKubePlus._process_template("application-upgrade/tenant1.yaml")
-        cmd = f"kubectl create -f {file} --kubeconfig=./application-upgrade/provider.conf"
+        cmd = f"kubectl create -f application-upgrade/resource-composition-localchart.yaml --kubeconfig=./application-upgrade/provider.conf"
         TestKubePlus.run_command(cmd)
 
         # CRDs check
@@ -377,15 +373,15 @@ def cleanup():
 
         # upgrade to version 2
         data = None
-        with open(file, 'r') as f:
+        with open('./application-upgrade/resource-composition-localchart.yaml', 'r') as f:
             data = yaml.safe_load(f)
 
         data['spec']['newResource']['chartURL'] = 'file:///resource-composition-0.0.2.tgz'
 
-        with open(file, 'w') as f:   
+        with open('./application-upgrade/resource-composition-localchart.yaml', 'w') as f:   
             yaml.safe_dump(data, f, default_flow_style=False)
 
-        cmd = f'kubectl apply -f {file} --kubeconfig=./application-upgrade/provider.conf'
+        cmd = 'kubectl apply -f ./application-upgrade/resource-composition-localchart.yaml --kubeconfig=./application-upgrade/provider.conf'
         out, err = TestKubePlus.run_command(cmd)
 
         # sleep to let the pods run

tests/wordpress-service-composition-chart-nopodpolicies.yaml

@@ -1,7 +1,7 @@
 apiVersion: workflows.kubeplus/v1alpha1
 kind: ResourceComposition
 metadata:
-  name: {{ name }}
+  name: wordpress-service-composition
 spec:
   # newResource defines the new CRD to be installed define a workflow.
   newResource:

tests/wordpress-service-composition-chart-withns.yaml

@@ -1,7 +1,7 @@
 apiVersion: workflows.kubeplus/v1alpha1
 kind: ResourceComposition
 metadata:
-  name: {{ name }}
+  name: wordpress-service-composition-ns
 spec:
   # newResource defines the new CRD to be installed define a workflow.
   newResource: