fix(hermes): recognize containerd release images
Some checks failed
Tests / Declarative: Post Actions failed: 49, skipped: 19, passed: 2816
Some checks failed
Tests / Declarative: Post Actions failed: 49, skipped: 19, passed: 2816
This commit is contained in:
parent
b87f33530b
commit
33c6f187b3
@ -139,7 +139,12 @@ def _pod_image_status(label: str, repository: str, digest: str) -> tuple[int, in
|
|||||||
for pod in pod_list.get("items", []):
|
for pod in pod_list.get("items", []):
|
||||||
statuses = list(pod.get("status", {}).get("initContainerStatuses", []))
|
statuses = list(pod.get("status", {}).get("initContainerStatuses", []))
|
||||||
statuses.extend(pod.get("status", {}).get("containerStatuses", []))
|
statuses.extend(pod.get("status", {}).get("containerStatuses", []))
|
||||||
relevant = [item for item in statuses if item.get("image", "").startswith(repository)]
|
relevant = [
|
||||||
|
item
|
||||||
|
for item in statuses
|
||||||
|
if item.get("image", "").startswith(repository)
|
||||||
|
or f"{repository}@" in (item.get("imageID") or "")
|
||||||
|
]
|
||||||
if not relevant:
|
if not relevant:
|
||||||
continue
|
continue
|
||||||
if all((item.get("imageID") or "").endswith(f"@{digest}") for item in relevant):
|
if all((item.get("imageID") or "").endswith(f"@{digest}") for item in relevant):
|
||||||
|
|||||||
@ -85,7 +85,9 @@ def _pods(repository: str, digest: str, *, ready: bool = True) -> dict:
|
|||||||
],
|
],
|
||||||
"containerStatuses": [
|
"containerStatuses": [
|
||||||
{
|
{
|
||||||
"image": f"{repository}@{digest}",
|
# K3s/containerd can expose only the local image digest
|
||||||
|
# here while retaining the registry identity in imageID.
|
||||||
|
"image": "sha256:" + "9" * 64,
|
||||||
"imageID": f"{repository}@{digest}",
|
"imageID": f"{repository}@{digest}",
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user