github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #131234 from carlory/fix-131229

Browse Source 
Fix flaky test: Metrics should grab all metrics from kubelet /metrics/resource endpoint
This commit is contained in:
Kubernetes Prow Robot 2025-04-14 08:19:13 -07:00 committed by GitHub
commit cfed8c7d41
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/e2e/framework/node/helper.go
View File

@ -188,10 +188,15 @@ func AddExtendedResource(ctx context.Context, clientSet clientset.Interface, nod
extendedResourceList := v1.ResourceList{ extendedResourceList := v1.ResourceList{
extendedResource: extendedResourceQuantity, extendedResource: extendedResourceQuantity,
} }
patchPayload, err := json.Marshal(v1.Node{
Status: v1.NodeStatus{ // This is a workaround for the fact that we shouldn't marshal a Node struct to JSON
Capacity: extendedResourceList, // because it wipes out some fields from node status like the daemonEndpoints and
Allocatable: extendedResourceList, // nodeInfo which should not be changed at this time. We need to use a map instead.
// See https://github.com/kubernetes/kubernetes/issues/131229
patchPayload, err := json.Marshal(map[string]any{
"status": map[string]any{
"capacity": extendedResourceList,
"allocatable": extendedResourceList,
}, },
}) })
framework.ExpectNoError(err, "Failed to marshal node JSON") framework.ExpectNoError(err, "Failed to marshal node JSON")