Amend k8s_test.py, fix CM report view

Signed-off-by: Matthias Büchse <matthias.buechse@alasca.cloud>

Author: mbuechse

Tests/kaas/k8s_test.py

@@ -23,6 +23,7 @@
 
 HERE = os.path.dirname(__file__)
 SCS_SONOBUOY_CONFIG_PATH = os.path.join(HERE, 'scs-sonobuoy-config-v1.yaml')
+KUBECONFIG_ROOT = os.path.join(os.path.expanduser('~'), '.local', 'share', 'scs', 'clusters')
 
 logger = logging.getLogger(__name__)
 
@@ -31,35 +32,35 @@ def usage(rcode=1, file=sys.stderr):
     """help output"""
     print("Usage: k8s_test.py [options] testcase-id1 ... testcase-idN", file=file)
     print("Options:", file=file)
-    print("  [-k/--kubeconfig KUBECONFIG_PATH] (required)", file=file)
+    print("  [-c/--cluster-id CLUSTER_ID] (required)", file=file)
     print("  [-s/--subject SUBJECT]", file=file)
     print("  [--execution-mode MODE] Sonobuoy mode: serial, parallel, or dry", file=file)
-    print("Runs specified testcases against the default context in kubeconfig provided", file=file)
-    print("via -k. Reports inconsistencies, errors etc.; returns 0 on success.", file=file)
+    print("Runs specified testcases against the kubeconfig specified via cluster_id.", file=file)
+    print("Reports inconsistencies, errors etc.; returns 0 on success.", file=file)
     print("Instead of listing testcase-ids, you can supply a single dash (-)", file=file)
     print("to have them read from stdin, one testcase-id per line.", file=file)
     sys.exit(rcode)
 
 
 class Config:
     def __init__(self):
-        self.kubeconfig_path = os.environ.get("KUBECONFIG")
+        self.cluster_id = None
         self.subject = None
         self.mode = 'serial'
         self.testcases = []
 
     def apply_argv(self, argv):
         """Parse cli arguments from the script call"""
         try:
-            opts, args = getopt.gnu_getopt(argv, "k:s:", ("kubeconfig=", "subject=", "execution-mode="))
+            opts, args = getopt.gnu_getopt(argv, "c:s:", ("cluster-id=", "subject=", "execution-mode="))
         except getopt.GetoptError as exc:
             print(f"CRITICAL: {exc!r}", file=sys.stderr)
             usage(1)
         for opt in opts:
             if opt[0] == "-h" or opt[0] == "--help":
                 usage(0)
-            elif opt[0] == "-k" or opt[0] == "--kubeconfig":
-                self.kubeconfig_path = opt[1]
+            elif opt[0] == "-c" or opt[0] == "--cluster-id":
+                self.cluster_id = opt[1]
             elif opt[0] == "-s" or opt[0] == "--subject":
                 self.subject = opt[1]
             elif opt[0] == "--execution-mode":
@@ -72,11 +73,15 @@ def apply_argv(self, argv):
         if len(self.testcases) != len(args):
             unknown = [a for a in args if a not in self.testcases]
             logger.warning(f"ignoring unknown testcases: {','.join(unknown)}")
-        if not self.kubeconfig_path:
+        if not self.cluster_id:
             print("CRITICAL: You need to have KUBECONFIG set or pass --kubeconfig=KUBECONFIG.", file=sys.stderr)
             sys.exit(1)
         if not self.subject:
-            self.subject = self.kubeconfig_path
+            self.subject = self.cluster_id
+
+    @property
+    def kubeconfig_path(self):
+        return os.path.join(KUBECONFIG_ROOT, self.cluster_id, 'kubeconfig.yaml')
 
     def compute_sono_args(self, *args):
         if self.mode == 'parallel':

Tests/kaas/plugin/run_plugin.py

@@ -17,12 +17,13 @@
     "kind": PluginKind,
     "static": PluginStatic,
 }
-BASEPATH = os.path.join(os.path.expanduser('~'), '.config', 'scs')
+CONFIG_PATH = os.path.join(os.path.expanduser('~'), '.config', 'scs')
+STATE_PATH = os.path.join(os.path.expanduser('~'), '.local', 'share', 'scs')
 
 
 def load_config(path='clusters.yaml'):
     if not os.path.isabs(path):
-        return load_config(os.path.normpath(os.path.join(BASEPATH, path)))
+        return load_config(os.path.normpath(os.path.join(CONFIG_PATH, path)))
     if not os.path.exists(path):
         raise FileNotFoundError()
     with open(path, "rb") as fileobj:
@@ -34,12 +35,14 @@ def load_config(path='clusters.yaml'):
     return cfg
 
 
-def init_plugin(plugin_kind, config, cwd='.'):
+def init_plugin(plugin_kind, config, cluster_id):
     plugin_maker = PLUGIN_LOOKUP.get(plugin_kind)
     if plugin_maker is None:
         raise ValueError(f"unknown plugin '{plugin_kind}'")
+    config.setdefault('name', cluster_id)
+    cwd = os.path.join(STATE_PATH, 'clusters', cluster_id)
     os.makedirs(cwd, exist_ok=True)
-    return plugin_maker(config, basepath=BASEPATH, cwd=cwd)
+    return plugin_maker(config, basepath=CONFIG_PATH, cwd=cwd)
 
 
 @click.group()
@@ -53,21 +56,15 @@ def cli(debug=False):
 @click.pass_obj
 def create(cfg, cluster_id):
     spec = cfg['clusters'][cluster_id]
-    config = spec['config']
-    config.setdefault('name', cluster_id)
-    cwd = os.path.abspath(cluster_id)
-    init_plugin(spec['kind'], config, cwd).create_cluster()
+    init_plugin(spec['kind'], spec['config'], cluster_id).create_cluster()
 
 
 @cli.command()
 @click.argument('cluster_id', type=str, default="default")
 @click.pass_obj
 def delete(cfg, cluster_id):
     spec = cfg['clusters'][cluster_id]
-    config = spec['config']
-    config.setdefault('name', cluster_id)
-    cwd = os.path.abspath(cluster_id)
-    init_plugin(spec['kind'], config, cwd).delete_cluster()
+    init_plugin(spec['kind'], spec['config'], cluster_id).delete_cluster()
 
 
 if __name__ == '__main__':

compliance-monitor/templates/overview.html.j2

@@ -12,7 +12,7 @@
     html {text-rendering:optimizelegibility;font-family:system-ui,-apple-system,Segoe UI,Roboto,Ubuntu,Cantarell,Noto Sans,sans-serif,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";}
     li {margin:0.33em 0;}
     #log + ul {padding-left:0;}
-    #log + ul > li {margin:0;display:block;text-indent:1em hanging;}
+    #log + ul > li {margin:0 0 0.3em 0;line-height:1em;display:block;text-indent:1em hanging;}
     #log + ul > li strong em {background-color:yellow;font-style:normal;}
 </style>
 {% if title %}<h1>{{title}}</h1>

compliance-monitor/templates/report.md.j2

@@ -22,7 +22,7 @@ else %}{% set uuid = report.uuid %}{% set scopeuuid = report.scope %}{% endif -%
 - {% if line.split(':', 1)[0].lower() in ('warning', 'error', 'critical') %}**_`{{line}}`_**{%
   elif line.startswith('INFO: *** ') %}{% if 'PASS' in line %} `{{line}}` {% else %} **`{{line}}`** {% endif %} 
   {: #{{line.split()[2]}} }{%
-  else %}`{{line}}`{% endif %}
+  else %}{% for line0 in line.splitlines() %}`{{line0}}`{%if not loop.last%}<br>{%endif%}{% endfor %}{% endif %}
 {%- endfor %}
 
 {% endif %}