Skip to content

Commit 0b266d2

Browse files
committed
[processor/k8sattributes] Fix k8s.node.uid extraction when node.name is disabled (#43865)
1 parent 443567a commit 0b266d2

File tree

3 files changed

+37
-1
lines changed

3 files changed

+37
-1
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
7+
component: processor/k8sattributes
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fix k8s.node.uid extraction when node.name is disabled
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [45328]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [api]

processor/k8sattributesprocessor/internal/kube/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ func removeUnnecessaryPodData(pod *api_v1.Pod, rules ExtractionRules) *api_v1.Po
981981
transformedPod.SetUID(pod.GetUID())
982982
}
983983

984-
if rules.Node {
984+
if rules.Node || rules.NodeUID {
985985
transformedPod.Spec.NodeName = pod.Spec.NodeName
986986
}
987987

processor/k8sattributesprocessor/internal/kube/client_test.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -852,6 +852,15 @@ func TestExtractionRules(t *testing.T) {
852852
}(),
853853
},
854854
},
855+
{
856+
name: "nodeUID",
857+
rules: ExtractionRules{
858+
NodeUID: true,
859+
},
860+
attributes: map[string]string{
861+
"k8s.node.name": "node1",
862+
},
863+
},
855864
{
856865
name: "labels",
857866
rules: ExtractionRules{

0 commit comments

Comments
 (0)