[processor/k8sattributes] Support name:tag@digest image name format #36145
Conversation
|
|
github-actions
bot
requested review from
dmitryax,
fatsheep9146 and
TylerHelmuth
spiffyy99
force-pushed
the
fix-k8s-image-parsing
branch
2 times, most recently
from
8a9c1bd
to
90d3a08
Compare
spiffyy99
force-pushed
the
fix-k8s-image-parsing
branch
3 times, most recently
from
e699514
to
09323ed
Compare
spiffyy99
force-pushed
the
fix-k8s-image-parsing
branch
from
09323ed
to
828a728
Compare
There was a problem hiding this comment.
Thank's for working on this @spiffyy99!
I think the fix is in the right direction but I left some concerns.
| @@ -816,7 +818,7 @@ func TestE2E_NamespacedRBACNoPodIP(t *testing.T) { | |||
| "k8s.container.name": newExpectedValue(equal, "telemetrygen"), | |||
| "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), | |||
| "container.image.repo_digests": newExpectedValue(shouldnotexist, ""), | |||
| "container.image.tag": newExpectedValue(equal, "latest"), | |||
| "container.image.tag": newExpectedValue(shouldnotexist, ""), | |||
There was a problem hiding this comment.
Shouldn't we honor that implicitly latest version here? Otherwise this might break users that rely on this assumption right now. @TylerHelmuth wdyt?
| @@ -504,7 +505,7 @@ func TestE2E_NamespacedRBAC(t *testing.T) { | |||
| "k8s.container.name": newExpectedValue(equal, "telemetrygen"), | |||
| "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), | |||
| "container.image.repo_digests": newExpectedValue(regex, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen@sha256:[0-9a-fA-f]{64}"), | |||
| "container.image.tag": newExpectedValue(equal, "latest"), | |||
| "container.image.tag": newExpectedValue(shouldnotexist, ""), | |||
There was a problem hiding this comment.
Should we preserve this? Unless it is a wrong assumption that we want to fix.
FWIWI a container with image: busybox in the spec will produce a running container with
image: docker.io/library/busybox:latest so technically I think that putting latest when the tag is absent in the spec, is correct.
| if c.Rules.ContainerImageName { | ||
| container.ImageName = name | ||
| } | ||
| if c.Rules.ContainerImageTag { |
There was a problem hiding this comment.
👍🏽
Since we are on it, I also wonder if we should override the ImageTag from the container's status in case it is available.
See https://github.com/kubernetes/api/blob/v0.32.0-alpha.3/core/v1/types.go#L3047-L3055.
| container.ImageName = spec.Image[:nameTagSep] | ||
| } else { | ||
| container.ImageName = spec.Image | ||
| name, tag, err := parseNameAndTagFromImage(spec.Image) |
There was a problem hiding this comment.
Could we reflect this logic in the documentation as well? Something like what was described at #36131 (comment)
Description
Fixed issue with
k8sattributesprocessorwhere digest is not properly separated from tag if both are present. used official docker library to perform parsing.Link to tracking issue
Fixes #36131
Testing
unit tests
integration/e2e tests
Documentation
N/A. Fields are already described correctly, this is simply fixing parsing logic