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

Jump to bottom

fix(sinsp): Get CRI image metadata both from image and imageRef #771

Merged
merged 2 commits into from
Dec 21, 2022
Merged

fix(sinsp): Get CRI image metadata both from image and imageRef #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95c97aa
fix(sinsp): Get CRI image metadata both from image and imageRef
gnosek Dec 5, 2022
79b8c1f
chore(sinsp): Add debugging messages to CRI metadata parsing
gnosek Dec 5, 2022
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
17 changes: 17 additions & 0 deletions userspace/libsinsp/container_engine/cri.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,15 @@ bool cri_async_source::parse(const key_type& key, sinsp_container_info& containe
// name stays at its default "<NA>" value.
}

g_logger.format(sinsp_logger::SEV_DEBUG,
"cri (%s): after parse_containerd: repo=%s tag=%s image=%s digest=%s",
container.m_id.c_str(),
container.m_imagerepo.c_str(),
container.m_imagetag.c_str(),
container.m_image.c_str(),
container.m_imagedigest.c_str());


if(s_cri_extra_queries)
{
if(!container.m_container_ip)
Expand All @@ -163,6 +172,14 @@ bool cri_async_source::parse(const key_type& key, sinsp_container_info& containe
if(container.m_imageid.empty())
{
container.m_imageid = m_cri->get_container_image_id(resp_container.image_ref());
g_logger.format(sinsp_logger::SEV_DEBUG,
"cri (%s): after get_container_image_id: repo=%s tag=%s image=%s digest=%s",
container.m_id.c_str(),
container.m_imagerepo.c_str(),
container.m_imagetag.c_str(),
container.m_image.c_str(),
container.m_imagedigest.c_str());

}
}

Expand Down
52 changes: 50 additions & 2 deletions userspace/libsinsp/cri.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,15 @@ bool cri_interface::parse_cri_image(const runtime::v1alpha2::ContainerStatus &st

bool have_digest = false;
const auto &image_ref = status.image_ref();
std::string image_name = status.image().image();
bool get_tag_from_image = false;
auto digest_start = image_ref.find("sha256:");

g_logger.format(sinsp_logger::SEV_DEBUG,
"cri (%s): parse_cri_image: image_ref=%s, digest_start=%d",
container.m_id.c_str(),
image_ref.c_str(), digest_start);

switch (digest_start)
{
case 0: // sha256:digest
Expand All @@ -125,18 +133,49 @@ bool cri_interface::parse_cri_image(const runtime::v1alpha2::ContainerStatus &st
break;
default: // host/image@sha256:digest
have_digest = image_ref[digest_start - 1] == '@';
if(have_digest)
{
image_name = image_ref.substr(0, digest_start - 1);
get_tag_from_image = true;
}
}

g_logger.format(sinsp_logger::SEV_DEBUG,
"cri (%s): parse_cri_image: have_digest=%d image_name=%s",
container.m_id.c_str(),
have_digest, image_name.c_str());

string hostname, port, digest;
sinsp_utils::split_container_image(status.image().image(),
sinsp_utils::split_container_image(image_name,
hostname,
port,
container.m_imagerepo,
container.m_imagetag,
digest,
false);
container.m_image = status.image().image();

if(get_tag_from_image)
{
g_logger.format(sinsp_logger::SEV_DEBUG,
"cri (%s): parse_cri_image: tag=%s, pulling tag from %s",
container.m_id.c_str(),
container.m_imagetag.c_str(),
status.image().image().c_str());

string digest2, repo;
sinsp_utils::split_container_image(status.image().image(),
hostname,
port,
repo,
container.m_imagetag,
digest2,
false);

image_name.push_back(':');
image_name.append(container.m_imagetag);
}

container.m_image = image_name;

if(have_digest)
{
Expand All @@ -146,6 +185,15 @@ bool cri_interface::parse_cri_image(const runtime::v1alpha2::ContainerStatus &st
{
container.m_imagedigest = digest;
}

g_logger.format(sinsp_logger::SEV_DEBUG,
"cri (%s): parse_cri_image: repo=%s tag=%s image=%s digest=%s",
container.m_id.c_str(),
container.m_imagerepo.c_str(),
container.m_imagetag.c_str(),
container.m_image.c_str(),
container.m_imagedigest.c_str());

return true;
}

Expand Down