Apply cluster configuration file handling

Signed-off-by: Toni Finger <[email protected]>

Author: tonifinger

Tests/config.toml

@@ -62,6 +62,7 @@ subject_root  = "{subject}"
 
 [subjects._.kubernetes_setup]
 kube_plugin         = "kind"
+kube_plugin_config  = "../playbooks/kubernetes_cluster_configs/kind_cluster_config.yaml"
 clusterspec         = "kaas/clusterspec.yaml"
 clusterspec_cluster = "current-k8s-release"
 

Tests/kaas/plugin/interface.py

@@ -1,4 +1,4 @@
-from abc import ABC, abstractmethod
+from abc import abstractmethod
 from typing import final
 import os
 import os.path
@@ -8,7 +8,7 @@
 logger = logging.getLogger("interface")
 
 
-class KubernetesClusterPlugin(ABC):
+class KubernetesClusterPlugin():
     """
     An abstract base class for custom Kubernetes cluster provider plugins.
     It represents an interface class from which the api provider-specific
@@ -21,9 +21,9 @@ class KubernetesClusterPlugin(ABC):
     working_directory = None
 
     @final
-    def __init__(self, config=None):
+    def __init__(self, config_file=None):
         logger.info(f"Init provider plug-in of type {self.__class__.__name__}")
-        self.config = config
+        self.config = config_file
         logger.debug(self.config)
         self.working_directory = os.getcwd()
         logger.debug(f"Working from {self.working_directory}")
@@ -56,12 +56,7 @@ def create(self, name="scs-cluster", version=None, kubeconfig_filepath=None):
         self.cluster_name = name
         self.cluster_version = version
 
-        self._create_cluster()  # TODO: maybe we do not need to use try exept here?
-        # try:
-        #     self._create_cluster()
-        # except Exception as e:
-        #     logging.exception(e)
-        #     self._delete_cluster()
+        self._create_cluster()
 
         if kubeconfig_filepath:
             shutil.move(self.kubeconfig, kubeconfig_filepath)

Tests/kaas/plugin/run_plugin.py

@@ -22,8 +22,8 @@ def init_plugin(plugin_kind, config=None):
     return plugin_maker(config)
 
 
-def run_plugin_create(plugin_kind, clusterspec_cluster, clusterspec):
-    plugin = init_plugin(plugin_kind)
+def run_plugin_create(plugin_kind, plugin_config, clusterspec_cluster, clusterspec):
+    plugin = init_plugin(plugin_kind, plugin_config)
     plugin.create(clusterspec_cluster, clusterspec[clusterspec_cluster]['branch'], os.path.abspath(clusterspec[clusterspec_cluster]['kubeconfig']))
 
 
@@ -44,11 +44,12 @@ def cli():
 
 @cli.command()
 @click.argument('plugin_kind', type=click.Choice(list(PLUGIN_LOOKUP), case_sensitive=False))
+@click.argument('plugin_config', type=click.Path(exists=True, dir_okay=False))
 @click.argument('clusterspec_path', type=click.Path(exists=True, dir_okay=False))
 @click.argument('clusterspec_cluster', type=str, default="default")
-def create(plugin_kind, clusterspec_path, clusterspec_cluster):
+def create(plugin_kind, plugin_config, clusterspec_path, clusterspec_cluster):
     clusterspec = load_spec(clusterspec_path)['clusters']
-    run_plugin_create(plugin_kind, clusterspec_cluster, clusterspec)
+    run_plugin_create(plugin_kind, plugin_config, clusterspec_cluster, clusterspec)
 
 
 @cli.command()

Tests/scs-test-runner.py

@@ -93,6 +93,7 @@ def build_provision_command(self, subject):
                 sys.executable, self.run_plugin_py,
                 'create',
                 kubernetes_setup['kube_plugin'],
+                self.abspath(kubernetes_setup['kube_plugin_config']),
                 self.abspath(kubernetes_setup['clusterspec']),
                 kubernetes_setup['clusterspec_cluster'],
             ],