oks-cli 1.15__tar.gz → 1.17__tar.gz

{oks_cli-1.15 → oks_cli-1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oks-cli
-Version: 1.15
+Version: 1.17
 Author: Outscale SAS
 Author-email: opensource@outscale.com
 License: BSD
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: certifi>=2024.8.30
 Requires-Dist: charset-normalizer>=3.3.2
-Requires-Dist: click>=8.1.7
+Requires-Dist: click<8.3.0,>=8.1.7
 Requires-Dist: colorama>=0.4.6
 Requires-Dist: idna>=3.10
 Requires-Dist: pyyaml>=6.0.2

{oks_cli-1.15 → oks_cli-1.17}/oks_cli/cache.py

@@ -1,11 +1,13 @@
 import click
-from .utils import clear_cache, find_project_id_by_name, find_cluster_id_by_name, get_all_cache, get_expiration_date, ctx_update, login_profile, profile_completer, cluster_completer, project_completer
-import prettytable
+from .utils import clear_cache, find_project_id_by_name, find_cluster_id_by_name, get_all_cache, get_expiration_date, \
+                   ctx_update, login_profile, profile_completer, cluster_completer, project_completer, print_table
+
+from prettytable import TableStyle
 
 # DEFINE THE CACHE COMMAND GROUP
 @click.group(help="Cache related commands.")
 @click.option('--project-name', '-p', required = False, help="Project Name", shell_complete=project_completer)
-@click.option('--cluster-name', '-c', required = False, help="Cluster Name", shell_complete=cluster_completer)
+@click.option('--cluster-name', '--name', '-c', required = False, help="Cluster Name", shell_complete=cluster_completer)
 @click.option("--profile", help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def cache(ctx, project_name, cluster_name, profile):
@@ -21,7 +23,7 @@ def delete_cache(force):
 
 @cache.command('kubeconfigs', help="List cached kubeconfigs")
 @click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
-@click.option('--cluster-name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
 @click.option('--plain', is_flag=True, help="Plain table format")
 @click.option('--msword', is_flag=True, help="Microsoft Word table format")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
@@ -36,14 +38,8 @@ def list_kubeconfigs(ctx, project_name, cluster_name, plain, msword, profile):
 
     result = get_all_cache(project_id, cluster_id, "kubeconfig")
 
-    table = prettytable.PrettyTable()
-    table.field_names = ["user",  "group", "expiration date"]
-
-    if plain:
-        table.set_style(prettytable.PLAIN_COLUMNS)
-
-    if msword:
-        table.set_style(prettytable.MSWORD_FRIENDLY)
+    data = list()
+    fields = [["user", "user"],["group", "group"], ["expiration date", "expires_at"]]
 
     for element in result:
         kubeconfig = None
@@ -57,7 +53,12 @@ def list_kubeconfigs(ctx, project_name, cluster_name, plain, msword, profile):
         if kubeconfig:
             exp = get_expiration_date(kubeconfig)
             row = user, group, exp
+            data.append({"user": user, "group": group, "expires_at": exp})
 
-            table.add_row(row)
+    style = None
+    if plain:
+        style = TableStyle.PLAIN_COLUMNS
+    if msword:
+        style = TableStyle.MSWORD_FRIENDLY
 
-    click.echo(table)
+    print_table(data, fields, style=style)

{oks_cli-1.15 → oks_cli-1.17}/oks_cli/cluster.py

@@ -6,23 +6,32 @@ from nacl.encoding import Base64Encoder
 
 import time
 import os
-import datetime
+from datetime import datetime
 import dateutil.parser
 import human_readable
+import pathlib
 import prettytable
 import logging
-
-from .utils import cluster_completer, do_request, print_output, find_project_id_by_name, find_cluster_id_by_name, get_cache, save_cache, detect_and_parse_input, verify_certificate, shell_completions, transform_tuple, profile_list, login_profile, cluster_create_in_background, ctx_update, set_cluster_id, get_cluster_id, get_project_id, get_template, get_cluster_name, format_changed_row, is_interesting_status, profile_completer, project_completer
+import yaml
+
+from prettytable import TableStyle
+from .utils import cluster_completer, do_request, print_output,                 \
+                   find_project_id_by_name, find_cluster_id_by_name,            \
+                   get_cache, save_cache, detect_and_parse_input,               \
+                   verify_certificate, shell_completions, transform_tuple,      \
+                   profile_list, login_profile, cluster_create_in_background,   \
+                   ctx_update, set_cluster_id, get_cluster_id, get_project_id,  \
+                   get_template, get_cluster_name, format_changed_row,          \
+                   is_interesting_status, profile_completer, project_completer, \
+                   kubeconfig_parse_fields, print_table, format_row
 
 from .profile import add_profile
 from .project import project_create, project_login
 
 # DEFINE THE CLUSTER GROUP
 @click.group(help="Cluster related commands.")
-@click.option('--project', 'project_name', required = False, help="Project Name")
-@click.option('--project-name', '-p', required = False, help="Project Name", shell_complete=project_completer)
-@click.option('--name', 'cluster_name', required = False, help="Cluster Name")
-@click.option('--cluster-name', '-c', required = False, help="Cluster Name", shell_complete=cluster_completer)
+@click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
 @click.option("--profile", help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def cluster(ctx, project_name, cluster_name, profile):
@@ -31,7 +40,7 @@ def cluster(ctx, project_name, cluster_name, profile):
 
 # LOGIN ON CLUSTER
 @cluster.command('login', help="Set a default cluster")
-@click.option('--cluster-name', '-c', required=False, help="Name of cluster", shell_complete=cluster_completer)
+@click.option('--cluster-name', '--name', '-c', required=False, help="Name of cluster", shell_complete=cluster_completer)
 @click.option("--profile", help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def cluster_login(ctx, cluster_name, profile):
@@ -71,34 +80,48 @@ def cluster_logout(ctx, profile):
 # LIST CLUSTERS
 @cluster.command('list', help="List all clusters")
 @click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
-@click.option('--name', 'cluster_name', required = False, help="Cluster Name")
-@click.option('--cluster-name', '-c', required = False, help="Cluster Name", shell_complete=cluster_completer)
-@click.option('--deleted', is_flag=True, help="List deleted clusters")
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
+@click.option('--deleted', '-x', is_flag=True, help="List deleted clusters")  # x pour "deleted" / "removed"
 @click.option('--plain', is_flag=True, help="Plain table format")
 @click.option('--msword', is_flag=True, help="Microsoft Word table format")
 @click.option('--watch', '-w', is_flag=True, help="Watch the changes")
-@click.option('-o', '--output', type=click.Choice(["json", "yaml", "wide"]), help="Specify output format")
+@click.option('--output', '-o', type=click.Choice(["json", "yaml", "wide"]), help="Specify output format")
 @click.option('--profile', help="Configuration profile to use")
+@click.option('--all', '-A', is_flag=True, help="List clusters from all projects")
 @click.pass_context
-def cluster_list(ctx, project_name, cluster_name, deleted, plain, msword, watch, output, profile):
+def cluster_list(ctx, project_name, cluster_name, deleted, plain, msword, watch, output, profile, all):
     """Display clusters with optional filtering and real-time monitoring."""
     project_name, cluster_name, profile = ctx_update(ctx, project_name, cluster_name, profile)
     login_profile(profile)
 
-    project_id = find_project_id_by_name(project_name)
-    cluster_id = get_cluster_id()
-
+    profile_name = os.getenv('OKS_PROFILE')
+    region_name = os.getenv('OKS_REGION')
     params = {}
-    params['project_id'] = project_id
+
+    if not all:
+        project_id = find_project_id_by_name(project_name)
+        params['project_id'] = project_id
+
+    cluster_id = get_cluster_id()
 
     if cluster_name:
         params['name'] = cluster_name
     if deleted:
         params['deleted'] = True
 
-    field_names = ["NAME", "CREATED", "UPDATED", "STATUS", "DEFAULT"]
+    field_names = ["CLUSTER", "PROFILE", "REGION", "CREATED", "UPDATED", "STATUS", "DEFAULT"]
+
+    if all:
+        field_names.insert(0, "PROJECT")
 
-    data = do_request("GET", 'clusters', params=params)
+        projects = {project["id"]: project for project in do_request("GET", "projects")}
+        data = do_request("GET", "clusters/all", params=params)
+
+        for cluster in data:
+            project = projects.get(cluster.get("project_id"))
+            cluster["project_name"] = project.get("name")
+    else:
+        data = do_request("GET", "clusters", params=params)
 
     if output == "wide":
         field_names.insert(0, "ID")
@@ -114,49 +137,27 @@ def cluster_list(ctx, project_name, cluster_name, deleted, plain, msword, watch,
     table._min_width = {"CREATED": 13, "UPDATED": 13, "STATUS": 10}
 
     if plain or watch:
-        table.set_style(prettytable.PLAIN_COLUMNS)
+        table.set_style(TableStyle.PLAIN_COLUMNS)
 
     if msword:
         table.set_style(prettytable.MSWORD_FRIENDLY)
 
-    def format_row(cluster):
-        status = cluster['statuses']['status']
-
-        is_default = True if cluster.get('id') == cluster_id else False
-
-        if status == 'ready':
-            msg = click.style(status, fg='green')
-        elif status == 'failed' or status == 'deleted':
-            msg = click.style(status, fg='red')
-        elif status == 'deploying':
-            msg = click.style(status, fg='yellow')
-        else:
-            msg = status
-
-        name = click.style(cluster['name'], bold=True)
-        if is_default:
-            default = "*"
-        else:
-            default = ""
-
-        created_at = dateutil.parser.parse(cluster['statuses']['created_at'])
-        updated_at = dateutil.parser.parse(cluster['statuses']['updated_at'])
-        now = datetime.datetime.now(tz = created_at.tzinfo)
-
-        row = [name, human_readable.date_time(now - created_at), human_readable.date_time(now - updated_at), msg, default]
+    initial_clusters = {}
 
+    for cluster in data:
+        row, _, name = format_row(cluster.get('statuses'), cluster.get('name'), cluster_id == cluster.get('id'))
+        row.insert(1, profile_name)
+        row.insert(2, region_name)
+        if all:
+            project_name = click.style(cluster.get("project_name"), bold=True)
+            row.insert(0, project_name)
         if output == "wide":
-            row.insert(0, cluster['id'])
-            row.append(cluster['version'])
-            row.append(cluster['control_planes'])
+            row.insert(0, cluster.get('id'))
+            row.append(cluster.get('version'))
+            row.append(cluster.get('control_planes'))
 
-        return row, status, cluster['name']
-
-    initial_clusters = {}
-    for cluster in data:
-        row, _, name = format_row(cluster)
         table.add_row(row)
-        initial_clusters[name] = cluster
+        initial_clusters[cluster.get("id")] = cluster
 
     click.echo(table)
 
@@ -168,46 +169,66 @@ def cluster_list(ctx, project_name, cluster_name, deleted, plain, msword, watch,
                 total_sleep += 2
 
                 try:
-                    data = do_request("GET", 'clusters', params=params)
+                    if all:
+                        projects = {project["id"]: project for project in do_request("GET", "projects")}
+                        data = do_request("GET", "clusters/all", params=params)
+
+                        for cluster in data:
+                            project = projects.get(cluster.get("project_id"))
+                            cluster["project_name"] = project.get("name")
+                    else:
+                        data = do_request("GET", 'clusters', params=params)
                 except click.ClickException as err:
                     click.echo(f"Error during watch: {err}")
                     continue
 
-                current_cluster_names = {cluster['name'] for cluster in data}
+                current_cluster_ids = {cluster.get('id') for cluster in data}
 
-                for name, cluster in list(initial_clusters.items()):
-                    if name not in current_cluster_names:
+                for id, cluster in list(initial_clusters.items()):
+                    if id not in current_cluster_ids:
                         deleted_cluster = cluster.copy()
                         deleted_cluster['statuses']['status'] = 'deleted'
 
-                        row, current_status, _ = format_row(deleted_cluster)
+                        row, current_status, _ = format_row(deleted_cluster.get('statuses'), deleted_cluster.get('name'), cluster_id == deleted_cluster.get('id'))
+                        row.insert(1, profile_name)
+                        row.insert(2, region_name)
+                        if all:
+                            project_name = click.style(cluster.get("project_name"), bold=True)
+                            row.insert(0, project_name)
 
                         new_table = format_changed_row(table, row)
                         click.echo(new_table)
                         
-                        del initial_clusters[name]
+                        del initial_clusters[id]
 
                 for cluster in data:
-                    row, current_status, name = format_row(cluster)
+                    row, current_status, name = format_row(cluster.get('statuses'), cluster.get('name'), cluster_id == cluster.get('id'))
+                    row.insert(1, profile_name)
+                    row.insert(2, region_name)
+                    if all:
+                        project_name = click.style(cluster.get("project_name"), bold=True)
+                        row.insert(0, project_name)
 
-                    if name not in initial_clusters:
+                    cl_id = cluster.get('id')
+
+                    if cl_id not in initial_clusters:
                         new_table = format_changed_row(table, row)
                         click.echo(new_table)
-                        initial_clusters[name] = cluster
+                        initial_clusters[cl_id] = cluster
                         continue
 
-                    stored_cluster = initial_clusters[name]
+                    stored_cluster = initial_clusters[cl_id]
                     cluster_status = stored_cluster.get('statuses').get('status')
                     if cluster_status != current_status:
                         new_table = format_changed_row(table, row)
                         click.echo(new_table)
-                        initial_clusters[name] = cluster
+                        initial_clusters[cl_id] = cluster
                         continue
 
                     if total_sleep % 10 == 0 and is_interesting_status(current_status):
                         new_table = format_changed_row(table, row)
                         click.echo(new_table)
-                        initial_clusters[name] = cluster
+                        initial_clusters[cl_id] = cluster
 
         except KeyboardInterrupt:
             click.echo("\nWatch stopped.")
@@ -215,10 +236,9 @@ def cluster_list(ctx, project_name, cluster_name, deleted, plain, msword, watch,
 
 # GET CLUSTER BY NAME
 @cluster.command('get', help="Get a cluster by name")
-@click.option('--project-name', '-p', required = False, help="Project Name", shell_complete=project_completer)
-@click.option('--name', 'cluster_name', required=False, help="Cluster Name", shell_complete=cluster_completer)
-@click.option('--cluster-name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
-@click.option('-o', '--output', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
+@click.option('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def cluster_get_command(ctx, project_name, cluster_name, output, profile):
@@ -234,6 +254,26 @@ def cluster_get_command(ctx, project_name, cluster_name, output, profile):
     print_output(data, output)
 
 
+def prepare_cluster_template(cluster_config):
+    cluster_template = get_template("cluster")
+
+    admin_whitelist = cluster_config.get("admin_whitelist") or []
+    if isinstance(admin_whitelist, str):
+        admin_whitelist = [admin_whitelist]
+
+    final_whitelist = []
+
+    for entry in admin_whitelist:
+        if entry == "my-ip":
+            final_whitelist.extend(cluster_template.get("admin_whitelist", []))
+        else:
+            final_whitelist.append(entry)
+
+    cluster_config["admin_whitelist"] = list(dict.fromkeys(final_whitelist))
+
+    cluster_template.update(cluster_config)
+    return cluster_template
+
 def _create_cluster(project_name, cluster_config, output):
     """Create a new cluster with interactive setup for missing profiles/projects."""
     profiles = profile_list()
@@ -274,8 +314,8 @@ def _create_cluster(project_name, cluster_config, output):
         project_name = project_name or "default"
         projects = do_request("GET", 'projects', params={"name": project_name})
 
-        cluster_template = get_template('cluster')
-        cluster_template.update(cluster_config)
+        cluster_template = prepare_cluster_template(cluster_config)
+        print_output(cluster_template, output)
 
         project_name_styled = click.style(project_name, bold=True)
         cluster_name_styled = click.style(cluster_template.get("name"), bold=True)
@@ -299,9 +339,7 @@ def _create_cluster(project_name, cluster_config, output):
     else:
         project_id = find_project_id_by_name(project_name)
 
-        cluster_template = get_template('cluster')
-        cluster_template.update(cluster_config)
-
+        cluster_template = prepare_cluster_template(cluster_config)
         do_request("GET", f'projects/{project_id}')
         cluster_template['project_id'] = project_id
 
@@ -313,22 +351,22 @@ def _create_cluster(project_name, cluster_config, output):
 @cluster.command('create', help="Create a new cluster")
 @click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
 @click.option('--cluster-name', '--name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
-@click.option('--description', help="Description of the cluster")
-@click.option('--admin', help="Admin Whitelist")
-@click.option('--version', shell_complete=shell_completions, help="Kubernetes version")
+@click.option('--description', '-d', help="Description of the cluster")
+@click.option('--admin', '-a', help="Admin Whitelist ips. you can use 'my-ip' to automatically use your current IP.")
+@click.option('--version', '-v', shell_complete=shell_completions, help="Kubernetes version")
 @click.option('--cidr-pods', help="CIDR of pods")
 @click.option('--cidr-service', help='CIDR of services')
 @click.option('--control-plane', shell_complete=shell_completions, help="Controlplane plan")
-@click.option('--zone', multiple=True, shell_complete=shell_completions, help="List of Control Plane availability zones")
+@click.option('--zone', '-z', multiple=True, shell_complete=shell_completions, help="List of Control Plane availability zones")
 @click.option('--enable-admission-plugins', help="List of admission plugins, separated by commas")
 @click.option('--disable-admission-plugins', help="List of admission plugins, separated by commas")
-@click.option('--quirk', multiple=True, help="Quirk")
-@click.option('--tags', help="Comma-separated list of tags, example: 'key1=value1,key2=value2'")
+@click.option('--quirk', '-q', multiple=True, help="Quirk")
+@click.option('--tags', '-t', help="Comma-separated list of tags, example: 'key1=value1,key2=value2'")
 @click.option('--disable-api-termination', type=click.BOOL, help="Disable delete action by API")
-@click.option('--cp-multi-az', is_flag=True, help="enable control plane multi az")
+@click.option('--cp-multi-az', '-m', is_flag=True, help="Enable control plane multi AZ")
 @click.option('--dry-run', is_flag=True, help="Client dry-run, only print the object that would be sent, without sending it")
-@click.option('-o', '--output', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
-@click.option('-f', '--filename', type=click.File("r"), help="Path to file to use to create the cluster ")
+@click.option('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@click.option('--filename', '-f', type=click.File("r"), help="Path to file to use to create the cluster ")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def cluster_create_command(ctx, project_name, cluster_name, description, admin, version, cidr_pods, cidr_service, control_plane, zone, enable_admission_plugins, disable_admission_plugins, quirk, tags, disable_api_termination, cp_multi_az, dry_run, output, filename, profile):
@@ -405,27 +443,25 @@ def cluster_create_command(ctx, project_name, cluster_name, description, admin,
     if not dry_run:
         _create_cluster(project_name, cluster_config, output)
     else:
-        cluster_template = get_template("cluster")
-        cluster_template.update(cluster_config)
+        cluster_template = prepare_cluster_template(cluster_config)
         print_output(cluster_template, output)
 
 # UPDATE CLUSTER
 @cluster.command('update', help="Update a cluster by name")
 @click.option('--project-name', '-p', required=False, help="Project name", shell_complete=project_completer)
-@click.option('--name', 'cluster_name', required=False, help="Cluster name")
-@click.option('--cluster-name', '-c', required=False, help="Cluster name", shell_complete=cluster_completer)
-@click.option('--description', help="Description of the cluster")
-@click.option('--admin', help="Admin Whitelist")
-@click.option('--version', shell_complete=shell_completions, help="Kubernetes version")
-@click.option('--tags', help="Comma-separated list of tags, example: 'key1=value1,key2=value2'")
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster name", shell_complete=cluster_completer)
+@click.option('--description', '-d', help="Description of the cluster")
+@click.option('--admin', '-a', help="Admin Whitelist ips. you can use 'my-ip' to automatically use your current IP.")
+@click.option('--version', '-v', shell_complete=shell_completions, help="Kubernetes version")
+@click.option('--tags', '-t', help="Comma-separated list of tags, example: 'key1=value1,key2=value2'")
 @click.option('--enable-admission-plugins', help="List of admission plugins, separated by commas")
 @click.option('--disable-admission-plugins', help="List of admission plugins, separated by commas")
-@click.option('--quirk', multiple=True, help="Quirk")
+@click.option('--quirk', '-q', multiple=True, help="Quirk")
 @click.option('--disable-api-termination', type=click.BOOL, help="Disable delete action by API")
 @click.option('--control-plane', shell_complete=shell_completions, help="Controlplane plan")
 @click.option('--dry-run', is_flag=True, help="Client dry-run, only print the object that would be sent, without sending it")
-@click.option('-o', '--output', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
-@click.option('-f', '--filename', type=click.File("r"), help="Path to file to use to update the cluster ")
+@click.option('--output', '-o',  type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@click.option('--filename', '-f', type=click.File("r"), help="Path to file to use to update the cluster ")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
 def cluster_update_command(ctx, project_name, cluster_name, description, admin, version, tags, enable_admission_plugins, disable_admission_plugins, quirk, disable_api_termination, control_plane, dry_run, output, filename, profile):
@@ -449,7 +485,23 @@ def cluster_update_command(ctx, project_name, cluster_name, description, admin,
         if len(admin) == 0:
             cluster_config['admin_whitelist'] = []
         else:
-            cluster_config['admin_whitelist'] = admin.split(',')
+            admin_list = admin.split(',')
+            resolved_ips = []
+            for ip in admin_list:
+                ip = ip.strip()
+                if ip == "my-ip":
+                    try:
+                        data = do_request("GET", "myip")
+                        if isinstance(data, dict) and "x_real_ip" in data:
+                            resolved_ip = data["x_real_ip"]
+                            resolved_ips.append(f"{resolved_ip}/32")
+                        else:
+                            raise click.ClickException(f"Unexpected response format from 'myip': {data}")
+                    except Exception as e:
+                        raise click.ClickException(f"Unable to resolve 'my-ip': {e}")
+                else:
+                    resolved_ips.append(ip)
+            cluster_config['admin_whitelist'] = resolved_ips
 
     if version is not None:
         cluster_config['version'] = version
@@ -500,9 +552,8 @@ def cluster_update_command(ctx, project_name, cluster_name, description, admin,
 # UPGRADE CLUSTER
 @cluster.command('upgrade', help="Upgrade a cluster by name")
 @click.option('--project-name', '-p', required=False, help="Project name", shell_complete=project_completer)
-@click.option('--name', 'cluster_name', required=False, help="Cluster name")
-@click.option('--cluster-name', '-c', required=False, help="Cluster name", shell_complete=cluster_completer)
-@click.option('-o', '--output', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster name", shell_complete=cluster_completer)
+@click.option('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
 @click.option('--force', is_flag=True, help="Force upgrade")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
@@ -522,9 +573,8 @@ def cluster_update_command(ctx, project_name, cluster_name, output, force, profi
 # DELETE CLUSTER BY NAME
 @cluster.command('delete', help="Delete a cluster by name")
 @click.option('--project-name', '-p', required=False, help="Project name", shell_complete=project_completer)
-@click.option('--name', 'cluster_name', required=False, help="Cluster name")
-@click.option('--cluster-name', '-c', required=False, help="Cluster name", shell_complete=cluster_completer)
-@click.option('-o', '--output', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster name", shell_complete=cluster_completer)
+@click.option('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
 @click.option('--dry-run', is_flag=True, help="Run without any action")
 @click.option('--force', is_flag=True, help="Force deletion without confirmation")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
@@ -554,9 +604,10 @@ def cluster_delete_command(ctx, project_name, cluster_name, output, dry_run, for
 # GET KUBECONFIG
 @cluster.command('kubeconfig', help="Fetch the kubeconfig for a cluster")
 @click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
-@click.option('--name', 'cluster_name', required=False, help="Cluster name")
-@click.option('--cluster-name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
 @click.option('--print-path', is_flag=True, help="Print path to saved kubeconfig")
+@click.option('--output', '-o', type=click.Choice(["json", "yaml", "table"]), default="yaml", help="Specify output format, default is yaml")
+@click.option('--wide', is_flag=True, help="Prints additional info, only supported for table output")
 @click.option('--refresh', '--force', is_flag=True, help="Force refresh saved kubeconfig")
 @click.option('--nacl', is_flag=True, help="Use public key encryption on wire (require api support)")
 @click.option('--user', type=click.STRING, help="User")
@@ -564,7 +615,7 @@ def cluster_delete_command(ctx, project_name, cluster_name, output, dry_run, for
 @click.option('--ttl', type=click.STRING, help="TTL in human readable format (5h, 1d, 1w)")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
 @click.pass_context
-def cluster_kubeconfig_command(ctx, project_name, cluster_name, print_path, refresh, nacl, user, group, ttl, profile):
+def cluster_kubeconfig_command(ctx, project_name, cluster_name, print_path, output, wide, refresh, nacl, user, group, ttl, profile):
     """CLI command to fetch and optionally print the kubeconfig for a specified cluster."""
     project_name, cluster_name, profile = ctx_update(ctx, project_name, cluster_name, profile)
     login_profile(profile)
@@ -619,9 +670,31 @@ def cluster_kubeconfig_command(ctx, project_name, cluster_name, print_path, refr
         kubeconfig_path = save_cache(project_id, cluster_id, 'kubeconfig', kubeconfig, user, group)
 
     if print_path:
-        print(kubeconfig_path)
+        click.echo(kubeconfig_path)
     else:
-        print(kubeconfig)
+        if output == 'table':
+            kubeconfig_path = pathlib.Path(kubeconfig_path).absolute()
+            if not user:
+                user = kubeconfig_path.parts[-3]
+            if not group:
+                group = kubeconfig_path.parts[-2]
+            if kubeconfig_path.is_file():
+                with kubeconfig_path.open() as f:
+                    kubeconfig_str = f.read()
+                kubedata = kubeconfig_parse_fields(kubeconfig_str, cluster_name, user, group)
+                if not len(kubedata):
+                    raise SystemExit("Something went wrong, could not parse kubeconfig")
+                fields = [["user", "user"], ["group", "group"], ["expiration date", "expires_at"]]
+                if wide:
+                    fields.extend([["Cert subject", "cn"], ["context:name", "context_name"], ["context:user", "ctx_user"],
+                                   ["context:cluster", "cluster_name"], ["cluster endpoint", "server_name"]])
+                print_table(kubedata, fields)
+            else:
+                raise SystemExit(f"Could not find {kubeconfig_path}")
+        elif output == 'json':
+            click.echo(json.dumps(yaml.safe_load(kubeconfig)))
+        else:
+            click.echo(kubeconfig)
 
 
 def _run_kubectl(project_id, cluster_id, user, group, args, input=None):
@@ -646,7 +719,7 @@ def _run_kubectl(project_id, cluster_id, user, group, args, input=None):
             "GET", f'clusters/{cluster_id}/kubeconfig')['data']['kubeconfig']
 
         if not kubeconfig_raw:
-            print("Cannot get kubeconfig")
+            click.echo("Cannot get kubeconfig")
             raise SystemExit()
 
         kubeconfig_path = save_cache(project_id, cluster_id, 'kubeconfig', kubeconfig_raw, user, group)
@@ -664,11 +737,11 @@ def _run_kubectl(project_id, cluster_id, user, group, args, input=None):
 
 @cluster.command('kubectl', help='Fetch the kubeconfig for a cluster and run kubectl against it', context_settings={"ignore_unknown_options": True})
 @click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
-@click.option('--cluster-name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
 @click.option('--user', type=click.STRING, help="User")
 @click.option('--group', type=click.STRING, help="Group")
-@click.argument("args", nargs=-1, type=click.UNPROCESSED)
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
+@click.argument("args", nargs=-1, type=click.UNPROCESSED)
 @click.pass_context
 def cluster_kubectl_command(ctx, project_name, cluster_name, user, group, args, profile):
     """CLI command to run kubectl against a specified cluster using its kubeconfig."""
@@ -681,9 +754,9 @@ def cluster_kubectl_command(ctx, project_name, cluster_name, user, group, args,
     _run_kubectl(project_id, cluster_id, user, group, args)
 
 
-@click.group(help="nodepool related commands.")
+@click.group(help="Nodepool related commands.")
 @click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
-@click.option('--cluster-name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
+@click.option('--cluster-name', '--name', '-c', required=False, help="Cluster Name", shell_complete=cluster_completer)
 @click.option('--user', type=click.STRING, help="User")
 @click.option('--group', type=click.STRING, help="Group")
 @click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
@@ -711,14 +784,14 @@ def nodepool_list(ctx):
                  'get', 'nodepool', '-o', 'wide'])
 
 
-@nodepool.command('create')
+@nodepool.command('create', help="Create a new nodepool")
 @click.option('--nodepool-name', '-n', default="nodepool01", help="Nodepool Name")
-@click.option('--count', default=2, help="Count of nodes")
-@click.option('--type', 'vmtype', default="tinav6.c2r4p3", help="Type of VMs")
-@click.option('--zone', multiple=True, required=True, help="Provide zone")
-@click.option('-o', '--output', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@click.option('--count', '-c', default=2, help="Count of nodes")
+@click.option('--type', 'vmtype', '-t', default="tinav6.c2r4p3", help="Type of VMs")
+@click.option('--zone', '-z', multiple=True, help="Provide zone(s)")
+@click.option('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
 @click.option('--dry-run', is_flag=True, help="Run without any action")
-@click.option('-f', '--filename', type=click.File("r"), help="Path to file to use to create the Nodepool ")
+@click.option('--filename', '-f', type=click.File("r"), help="Path to file to use to create the Nodepool")
 @click.pass_context
 def setup_worker_pool(ctx, nodepool_name, count, vmtype, zone, output, dry_run, filename):
     """Create a new nodepool in the cluster, optionally from a file or parameters."""
@@ -734,6 +807,9 @@ def setup_worker_pool(ctx, nodepool_name, count, vmtype, zone, output, dry_run,
         if zone:
             nodepool['spec']["zones"] = list(zone)
 
+    if not nodepool['spec']["zones"]:
+        raise click.BadArgumentUsage("Missing option '--zone' / '-z'.")
+
     if dry_run:
         print_output(nodepool, output)
     else: