Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handling of no services case #178

Merged
merged 1 commit into from
Nov 19, 2024
Merged

Handling of no services case #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 47 additions & 40 deletions src/edge_containers_cli/cmds/argo_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@
import polars
from ruamel.yaml import YAML

from edge_containers_cli.cmds.commands import CommandError, Commands, ServicesDataFrame
from edge_containers_cli.cmds.commands import (
CommandError,
Commands,
ServicesDataFrame,
ServicesSchema,
)
from edge_containers_cli.definitions import ECContext
from edge_containers_cli.git import set_values
from edge_containers_cli.globals import TIME_FORMAT
Expand Down Expand Up @@ -139,45 +144,47 @@ def _get_services(self, running_only) -> ServicesDataFrame:
)
app_dicts = YAML(typ="safe").load(app_resp)

if not app_dicts:
raise CommandError(f"No ec-services found in {self.target}")
for app in app_dicts:
resources_dict = app["status"]["resources"]

for resource in resources_dict:
is_ready = False
if resource["kind"] == "StatefulSet":
name = app["metadata"]["name"]

# check if replicas ready
mani_resp = shell.run_command(
f"argocd app manifests {namespace}/{name} --source live",
)
for resource_manifest in mani_resp.split("---")[1:]:
manifest = YAML(typ="safe").load(resource_manifest)
if not manifest:
continue
kind = manifest["kind"]
resource_name = manifest["metadata"]["name"]
if kind == "StatefulSet" and resource_name == name:
try:
is_ready = bool(manifest["status"]["readyReplicas"])
except (KeyError, TypeError): # Not ready if doesnt exist
is_ready = False
time_stamp = datetime.strptime(
manifest["metadata"]["creationTimestamp"],
"%Y-%m-%dT%H:%M:%SZ",
)
service_data["name"].append(name)
service_data["version"].append(
app["spec"]["source"]["targetRevision"]
)
service_data["ready"].append(is_ready)
service_data["deployed"].append(
datetime.strftime(time_stamp, TIME_FORMAT)
)

services_df = polars.from_dict(service_data)
if app_dicts:
for app in app_dicts:
resources_dict = app["status"]["resources"]

for resource in resources_dict:
is_ready = False
if resource["kind"] == "StatefulSet":
name = app["metadata"]["name"]

# check if replicas ready
mani_resp = shell.run_command(
f"argocd app manifests {namespace}/{name} --source live",
)
for resource_manifest in mani_resp.split("---")[1:]:
manifest = YAML(typ="safe").load(resource_manifest)
if not manifest:
continue
kind = manifest["kind"]
resource_name = manifest["metadata"]["name"]
if kind == "StatefulSet" and resource_name == name:
try:
is_ready = bool(manifest["status"]["readyReplicas"])
except (
KeyError,
TypeError,
): # Not ready if doesnt exist
is_ready = False
time_stamp = datetime.strptime(
manifest["metadata"]["creationTimestamp"],
"%Y-%m-%dT%H:%M:%SZ",
)
service_data["name"].append(name)
service_data["version"].append(
app["spec"]["source"]["targetRevision"]
)
service_data["ready"].append(is_ready)
service_data["deployed"].append(
datetime.strftime(time_stamp, TIME_FORMAT)
)

services_df = polars.from_dict(service_data, schema=ServicesSchema)

if running_only:
services_df = services_df.filter(polars.col("ready").eq(True))
Expand Down
50 changes: 31 additions & 19 deletions src/edge_containers_cli/cmds/k8s_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,34 +124,46 @@ def _get_services(self, running_only):
f'kubectl get statefulset -l "is_ioc==true" -n {self.target} -o yaml',
)
sts_dicts = YAML(typ="safe").load(kubectl_res)
if not sts_dicts["items"]:
raise CommandError(f"No ec-services found in {self.target}")
service_data = {
"name": [], # type: ignore
"ready": [],
"deployed": [],
}
for sts in sts_dicts["items"]:
name = sts["metadata"]["name"]
time_stamp = datetime.strptime(
sts["metadata"]["creationTimestamp"], "%Y-%m-%dT%H:%M:%SZ"
)
try:
is_ready = bool(sts["status"]["readyReplicas"])
except KeyError: # Not ready if doesnt exist
is_ready = False

# Fill app data
service_data["name"].append(name)
service_data["ready"].append(is_ready)
service_data["deployed"].append(datetime.strftime(time_stamp, TIME_FORMAT))

services_df = polars.from_dict(service_data)
if sts_dicts["items"]:
for sts in sts_dicts["items"]:
name = sts["metadata"]["name"]
time_stamp = datetime.strptime(
sts["metadata"]["creationTimestamp"], "%Y-%m-%dT%H:%M:%SZ"
)
try:
is_ready = bool(sts["status"]["readyReplicas"])
except KeyError: # Not ready if doesnt exist
is_ready = False

# Fill app data
service_data["name"].append(name)
service_data["ready"].append(is_ready)
service_data["deployed"].append(
datetime.strftime(time_stamp, TIME_FORMAT)
)

services_df = polars.from_dict(
service_data,
schema=polars.Schema(
{
"name": polars.String,
"ready": polars.Boolean,
"deployed": polars.String,
}
),
)

# Adds the version for all services
helm_out = str(shell.run_command(f"helm list -n {self.target} -o json"))
if helm_out == "[]\n":
helm_df = polars.DataFrame({"name": [""], "version": [""]})
helm_df = polars.DataFrame(
schema=polars.Schema({"name": polars.String, "version": polars.String})
)
else:
helm_df = polars.read_json(StringIO(str(helm_out)))
helm_df = helm_df.rename({"app_version": "version"})
Expand Down
2 changes: 1 addition & 1 deletion src/edge_containers_cli/cmds/monitor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ def _get_iocs(self) -> None:
for i, ioc in enumerate(self.iocs):
ioc = {key: value for key, value in ioc.items() if key not in exclude}
self.iocs[i] = ioc
self.columns = [key for key in self.iocs[0].keys() if key not in exclude]
self.columns = [key for key in self.iocs_df.columns if key not in exclude]

def _convert_df_to_list(self, iocs_df: polars.DataFrame | list) -> list[dict]:
if isinstance(iocs_df, polars.DataFrame):
Expand Down