do not use dot in cluster name; improve logging

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

Author: mbuechse

Tests/kaas/plugin/plugin_clusterstacks.py

@@ -12,6 +12,7 @@
 from interface import KubernetesClusterPlugin
 
 logger = logging.getLogger(__name__)
+logging.getLogger("kubernetes").setLevel(logging.INFO)
 
 
 TEMPLATE_KEYS = ('cluster', 'clusterstack', 'kubeconfig')
@@ -63,7 +64,6 @@ def __init__(self, config, basepath='.', cwd='.'):
         self.basepath = basepath
         self.cwd = cwd
         self.config = config
-        logger.debug(self.config)
         self.env = Environment()
         self.template_map = load_templates(self.env, self.basepath, self.config['templates'])
         self.vars = self.config['vars']
@@ -125,9 +125,9 @@ def create_cluster(self):
                     if item['spec']['clusterName'] == name
                 ]
                 working = [item[0] for item in items if item[1] != 'provisioned']
-                if not working:
+                if items and not working:
                     break
-                logger.debug('waiting 30 s for machines to become ready:', items)
+                logger.debug(f'waiting 30 s for machines to become ready: {working}')
                 time.sleep(30)
             # mimic `kubectl get secrets NAME -o=jsonpath='{.data.value}' | base64 -d  > kubeconfig.yaml`
             res = kubernetes.client.CoreV1Api(api_client).read_namespaced_secret(secret_name, self.namespace)

Tests/kaas/plugin/run_plugin.py

@@ -41,8 +41,9 @@ def init_plugin(plugin_kind, config, cwd='.'):
 
 
 @click.group()
-def cli():
-    pass
+@click.option('-d', '--debug', 'debug', is_flag=True)
+def cli(debug=False):
+    logging.Logger.root.setLevel(logging.DEBUG if debug else logging.INFO)
 
 
 @cli.command()
@@ -51,7 +52,7 @@ def cli():
 def create(cfg, cluster_id):
     spec = cfg['clusters'][cluster_id]
     config = spec['config']
-    config['name'] = cluster_id
+    config.setdefault('name', cluster_id)
     cwd = os.path.abspath(cluster_id)
     init_plugin(spec['kind'], config, cwd).create_cluster()
 
@@ -62,7 +63,7 @@ def create(cfg, cluster_id):
 def delete(cfg, cluster_id):
     spec = cfg['clusters'][cluster_id]
     config = spec['config']
-    config['name'] = cluster_id
+    config.setdefault('name', cluster_id)
     cwd = os.path.abspath(cluster_id)
     init_plugin(spec['kind'], config, cwd).delete_cluster()
 

playbooks/clusters.yaml.j2

@@ -4,6 +4,7 @@ clusters:
     kind: clusterstacks
     config:
       kubernetesVersion: '1.32'
+      name: 'syself-1-32'  # explicit name because dot in name not permissible
       autoVars: syself  # determine cs_class_name and cs_version automatically using kubernetesVersion
       templates:
         cluster: syself-cluster.yaml
@@ -17,6 +18,7 @@ clusters:
     kind: clusterstacks
     config:
       kubernetesVersion: '1.31'
+      name: 'syself-1-31'  # explicit name because dot in name not permissible
       autoVars: syself  # determine cs_class_name and cs_version automatically using kubernetesVersion
       templates:
         cluster: syself-cluster.yaml
@@ -30,6 +32,7 @@ clusters:
     kind: clusterstacks
     config:
       kubernetesVersion: '1.30'
+      name: 'syself-1-30'  # explicit name because dot in name not permissible
       autoVars: syself  # determine cs_class_name and cs_version automatically using kubernetesVersion
       templates:
         cluster: syself-cluster.yaml