X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Fk8s_juju_conn.py;h=d9dc6073000f1029a98d7044c8d7fa30961622ad;hp=1f217f8c2429647cd33bd7c13c8957290e898112;hb=ed0ff05f09f276c753e5aa5439a3a1252b6a07e4;hpb=867418c142ece1ef0e4c9e083bc747c1f3d13a3c diff --git a/n2vc/k8s_juju_conn.py b/n2vc/k8s_juju_conn.py index 1f217f8..d9dc607 100644 --- a/n2vc/k8s_juju_conn.py +++ b/n2vc/k8s_juju_conn.py @@ -129,7 +129,7 @@ class K8sJujuConnector(K8sConnector): cleanup_data.append( { "delete": kubectl.delete_cluster_role, - "args": (metadata_name), + "args": (metadata_name,), } ) @@ -140,7 +140,7 @@ class K8sJujuConnector(K8sConnector): cleanup_data.append( { "delete": kubectl.delete_service_account, - "args": (metadata_name), + "args": (metadata_name,), } ) @@ -151,7 +151,7 @@ class K8sJujuConnector(K8sConnector): cleanup_data.append( { "delete": kubectl.delete_service_account, - "args": (metadata_name), + "args": (metadata_name,), } ) token, client_cert_data = await kubectl.get_secret_data( @@ -303,6 +303,10 @@ class K8sJujuConnector(K8sConnector): raise K8sException("bundle must be set") if bundle.startswith("cs:"): + # For Juju Bundles provided by the Charm Store + pass + elif bundle.startswith("ch:"): + # For Juju Bundles provided by the Charm Hub (this only works for juju version >= 2.9) pass elif bundle.startswith("http"): # Download the file