Adapt cluster-stack plugin based on changes made in target branch

Signed-off-by: michal.gubricky <[email protected]>

Tests/kaas/clusterspec.yaml

@@ -3,9 +3,18 @@ clusters:
   default:
     branch: default
     kubeconfig: kubeconfig.yaml
-  v1.29:
-    branch: "1.29"
-    kubeconfig: kubecfg129.yaml
-  v1.30:
-    branch: "1.30"
-    kubeconfig: kubecfg130.yaml
+    # Cluster-stack specific
+      # cs_name: 
+      # cs_k8s_version:
+      # cs_version:
+      # cs_channel:
+      # cs_cloudname:
+      # cs_secret_name:
+    # Cluster specific
+      # 
+  # v1.29:
+  #   branch: "1.29"
+  #   kubeconfig: kubecfg129.yaml
+  # v1.30:
+  #   branch: "1.30"
+  #   kubeconfig: kubecfg130.yaml

Tests/kaas/plugin/interface.py

@@ -55,14 +55,8 @@ def create(self, name="scs-cluster", version=None, kubeconfig_filepath=None):
         """
         self.cluster_name = name
         self.cluster_version = version
-<<<<<<< HEAD
-=======
         self.kubeconfig_filepath = kubeconfig_filepath
 
-        try:
-            self._create_cluster()
->>>>>>> Add ability to remove kubeconfig
-
         self._create_cluster()  # TODO: maybe we do not need to use try exept here?
         # try:
         #     self._create_cluster()