first sketches regards #882

Signed-off-by: Matthias Büchse <[email protected]>

Author: mbuechse

Tests/kaas/plugin/plugin_kind.py

@@ -28,12 +28,15 @@ def create_cluster(self, cluster_name, version, kubeconfig):
         :return: kubeconfig_filepath
         """
         cluster_version = version
+        # latest versions to be found under https://hub.docker.com/r/kindest/node/tags
         if cluster_version == '1.29':
-            cluster_version = 'v1.29.8'
+            cluster_version = 'v1.29.14'
         elif cluster_version == '1.30':
-            cluster_version = 'v1.30.4'
+            cluster_version = 'v1.30.10'
         elif cluster_version == '1.31' or cluster_version == 'default':
-            cluster_version = 'v1.31.1'
+            cluster_version = 'v1.31.6'
+        elif cluster_version == '1.32':
+            cluster_version = 'v1.32.3'
         cluster_image = f"kindest/node:{cluster_version}"
         kubeconfig_filepath = Path(kubeconfig)
         if kubeconfig_filepath is None:

Tests/kaas/plugin/run_plugin.py

@@ -8,22 +8,33 @@
 from plugin_kind import PluginKind
 from plugin_static import PluginStatic
 
+
 PLUGIN_LOOKUP = {
     "kind": PluginKind,
     "static": PluginStatic,
 }
 
 
-def init_plugin(plugin_kind, config_path):
+def load_config(path=None):
+    if path:
+        with open(path, "rb") as fileobj:
+            cfg = yaml.load(fileobj, Loader=yaml.SafeLoader)
+        if not isinstance(cfg, dict):
+            raise RuntimeError('clusters.yaml must be a YAML dict')
+        if 'clusters' not in cfg or not isinstance(cfg['clusters'], dict):
+            raise RuntimeError('clusters.yaml must be a YAML dict, and so must be .clusters')
+        return cfg
+    path = os.path.join(os.path.expanduser('~'), '.config', 'scs', 'clusters.yaml')
+    if os.path.exists(path):
+        return load_config(path)
+    raise FileNotFoundError('config')
+
+
+def init_plugin(plugin_kind, config):
     plugin_maker = PLUGIN_LOOKUP.get(plugin_kind)
     if plugin_maker is None:
         raise ValueError(f"unknown plugin '{plugin_kind}'")
-    return plugin_maker(config_path)
-
-
-def load_spec(clusterspec_path):
-    with open(clusterspec_path, "rb") as fileobj:
-        return yaml.load(fileobj, Loader=yaml.SafeLoader)
+    return plugin_maker(config)
 
 
 @click.group()
@@ -32,27 +43,25 @@ 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('cluster_id', type=str, default="default")
-def create(plugin_kind, plugin_config, clusterspec_path, cluster_id):
-    clusterspec = load_spec(clusterspec_path)['clusters']
-    plugin = init_plugin(plugin_kind, plugin_config)
-    clusterinfo = clusterspec[cluster_id]
-    plugin.create_cluster(cluster_id, clusterinfo['branch'], os.path.abspath(clusterinfo['kubeconfig']))
+@cli.pass_obj
+def create(cfg, cluster_id):
+    spec = cfg[cluster_id]
+    config = spec['config']
+    config['name'] = cluster_id
+    init_plugin(spec['kind'], config).create_cluster()
 
 
 @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('cluster_id', type=str, default="default")
-def delete(plugin_kind, plugin_config, clusterspec_path, cluster_id):
-    plugin = init_plugin(plugin_kind, plugin_config)
-    plugin.delete_cluster(cluster_id)
+@cli.pass_obj
+def delete(cfg, cluster_id):
+    spec = cfg[cluster_id]
+    config = spec['config']
+    config['name'] = cluster_id
+    init_plugin(spec['kind'], config).delete_cluster()
 
 
 if __name__ == '__main__':
     logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.INFO)
-    cli()
+    cli(obj=load_config())

playbooks/clusters.yaml.j2

@@ -0,0 +1,32 @@
+---
+clusters:
+  syself-1.32:
+    kind: clusterstacks
+    config:
+      token: "{{ clouds_conf.syself_token }}"
+      kubernetesVersion: '1.32'
+      autoVars: syself  # will determine class and version automatically using kubernetesVersion
+      cluster: syself-cluster.yaml
+      clusterstack: syself-clusterstack.yaml
+      vars:
+        cs-name: hetzner-apalla-1-32
+  syself-1.31:
+    kind: clusterstacks
+    config:
+      token: "{{ clouds_conf.syself_token }}"
+      kubernetesVersion: '1.31'
+      autoVars: syself  # will determine class and version automatically using kubernetesVersion
+      cluster: syself-cluster.yaml
+      clusterstack: syself-clusterstack.yaml
+      vars:
+        cs-name: hetzner-apalla-1-31
+  syself-1.30:
+    kind: clusterstacks
+    config:
+      token: "{{ clouds_conf.syself_token }}"
+      kubernetesVersion: '1.30'
+      autoVars: syself  # will determine class and version automatically using kubernetesVersion
+      cluster: syself-cluster.yaml
+      clusterstack: syself-clusterstack.yaml
+      vars:
+        cs-name: hetzner-apalla-1-30