projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
feature: helm charts repos with certs
[osm/N2VC.git]
/
n2vc
/
k8s_juju_conn.py
diff --git
a/n2vc/k8s_juju_conn.py
b/n2vc/k8s_juju_conn.py
index
1f217f8
..
1e400c2
100644
(file)
--- a/
n2vc/k8s_juju_conn.py
+++ b/
n2vc/k8s_juju_conn.py
@@
-122,14
+122,16
@@
class K8sJujuConnector(K8sConnector):
# if it fails in the middle of the process
cleanup_data = []
try:
# if it fails in the middle of the process
cleanup_data = []
try:
+ self.log.debug("Initializing K8s cluster for juju")
kubectl.create_cluster_role(
name=metadata_name,
labels=labels,
)
kubectl.create_cluster_role(
name=metadata_name,
labels=labels,
)
+ self.log.debug("Cluster role created")
cleanup_data.append(
{
"delete": kubectl.delete_cluster_role,
cleanup_data.append(
{
"delete": kubectl.delete_cluster_role,
- "args": (metadata_name),
+ "args": (metadata_name
,
),
}
)
}
)
@@
-137,10
+139,11
@@
class K8sJujuConnector(K8sConnector):
name=metadata_name,
labels=labels,
)
name=metadata_name,
labels=labels,
)
+ self.log.debug("Service account created")
cleanup_data.append(
{
"delete": kubectl.delete_service_account,
cleanup_data.append(
{
"delete": kubectl.delete_service_account,
- "args": (metadata_name),
+ "args": (metadata_name
,
),
}
)
}
)
@@
-148,10
+151,11
@@
class K8sJujuConnector(K8sConnector):
name=metadata_name,
labels=labels,
)
name=metadata_name,
labels=labels,
)
+ self.log.debug("Role binding created")
cleanup_data.append(
{
"delete": kubectl.delete_service_account,
cleanup_data.append(
{
"delete": kubectl.delete_service_account,
- "args": (metadata_name),
+ "args": (metadata_name
,
),
}
)
token, client_cert_data = await kubectl.get_secret_data(
}
)
token, client_cert_data = await kubectl.get_secret_data(
@@
-159,6
+163,7
@@
class K8sJujuConnector(K8sConnector):
)
default_storage_class = kubectl.get_default_storage_class()
)
default_storage_class = kubectl.get_default_storage_class()
+ self.log.debug("Default storage class: {}".format(default_storage_class))
await libjuju.add_k8s(
name=cluster_uuid,
rbac_id=rbac_id,
await libjuju.add_k8s(
name=cluster_uuid,
rbac_id=rbac_id,
@@
-168,9
+173,10
@@
class K8sJujuConnector(K8sConnector):
storage_class=default_storage_class,
credential_name=self._get_credential_name(cluster_uuid),
)
storage_class=default_storage_class,
credential_name=self._get_credential_name(cluster_uuid),
)
+ self.log.debug("K8s cluster added to juju controller")
return cluster_uuid, True
except Exception as e:
return cluster_uuid, True
except Exception as e:
- self.log.error("Error initializing k8scluster: {}".format(e))
+ self.log.error("Error initializing k8scluster: {}".format(e)
, exc_info=True
)
if len(cleanup_data) > 0:
self.log.debug("Cleaning up created resources in k8s cluster...")
for item in cleanup_data:
if len(cleanup_data) > 0:
self.log.debug("Cleaning up created resources in k8s cluster...")
for item in cleanup_data:
@@
-187,6
+193,9
@@
class K8sJujuConnector(K8sConnector):
name: str,
url: str,
_type: str = "charm",
name: str,
url: str,
_type: str = "charm",
+ cert: str = None,
+ user: str = None,
+ password: str = None,
):
raise MethodNotImplemented()
):
raise MethodNotImplemented()
@@
-303,6
+312,10
@@
class K8sJujuConnector(K8sConnector):
raise K8sException("bundle must be set")
if bundle.startswith("cs:"):
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
pass
elif bundle.startswith("http"):
# Download the file