Skip to content

Commit 2271b58

Browse files
committed
feat(k8scluster): add supported cluster types
1 parent 407ed84 commit 2271b58

File tree

2 files changed

+67
-4
lines changed

2 files changed

+67
-4
lines changed

hpecp/cli/k8scluster.py

+35
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,41 @@ def upgrade_cluster(
443443
id, k8s_upgrade_version, worker_upgrade_percent
444444
)
445445

446+
@base.intercept_exception
447+
def import_cluster(
448+
self,
449+
cluster_type,
450+
name,
451+
description,
452+
pod_dns_domain,
453+
server_url,
454+
ca,
455+
bearer_token,
456+
):
457+
"""Import a k8s cluster.
458+
459+
TODO
460+
461+
Returns
462+
-------
463+
TODO
464+
465+
Raises
466+
------
467+
APIException
468+
"""
469+
print(
470+
base.get_client().k8s_cluster.import_cluster(
471+
cluster_type,
472+
name,
473+
description,
474+
pod_dns_domain,
475+
server_url,
476+
ca,
477+
bearer_token,
478+
)
479+
)
480+
446481
@base.intercept_exception
447482
def import_generic_cluster(
448483
self, name, description, pod_dns_domain, server_url, ca, bearer_token

hpecp/k8s_cluster.py

+32-4
Original file line numberDiff line numberDiff line change
@@ -586,10 +586,17 @@ def upgrade_cluster(
586586
)
587587
return response.json()
588588

589-
def import_generic_cluster(
590-
self, name, description, pod_dns_domain, server_url, ca, bearer_token
589+
def import_cluster(
590+
self,
591+
cluster_type,
592+
name,
593+
description,
594+
pod_dns_domain,
595+
server_url,
596+
ca,
597+
bearer_token,
591598
):
592-
"""Import a generic k8s cluster.
599+
"""Import a k8s cluster.
593600
594601
TODO
595602
@@ -601,10 +608,18 @@ def import_generic_cluster(
601608
------
602609
APIException
603610
"""
611+
assert cluster_type in [
612+
"generic",
613+
"eks",
614+
"aks",
615+
"gke",
616+
"pks",
617+
], 'cluster_type must be either "generic", "eks", "aks", "gke", "pks"'
618+
604619
data = {
605620
"label": {"name": name, "description": description},
606621
"pod_dns_domain": pod_dns_domain,
607-
"type": "generic",
622+
"type": cluster_type,
608623
"sysadmin_data": {
609624
"server_url": server_url,
610625
"ca": ca,
@@ -620,6 +635,19 @@ def import_generic_cluster(
620635
)
621636
return CaseInsensitiveDict(response.headers)["Location"]
622637

638+
def import_generic_cluster(
639+
self, name, description, pod_dns_domain, server_url, ca, bearer_token
640+
):
641+
return self.import_cluster(
642+
"generic",
643+
name,
644+
description,
645+
pod_dns_domain,
646+
server_url,
647+
ca,
648+
bearer_token,
649+
)
650+
623651
def import_generic_cluster_with_json(self, json):
624652
"""Import a generic k8s cluster.
625653

0 commit comments

Comments
 (0)