cc @samuelkarp

Just FYI, CI is not triggering properly most likely due to an ongoing Github issue; from their status page: Update - Actions is experiencing degraded performance. We are continuing to investigate.

/test pull-containerd-node-e2e-1-7

/test pull-containerd-node-e2e-1-7

/test pull-containerd-node-e2e-1-7

@ruiwen-zhao You can update the .mailmap file like this 1f865eb#diff-cfe707d774682f3bbb07d3be5119da9938f80153b7d2cc168c02de9b8595caccR48 to fix names appearing multiple times.

Test pull-containerd-node-e2e-1-7 keeps failing with

E2eNode Suite: [It] [sig-node] ResourceMetricsAPI [NodeFeature:ResourceMetrics] when querying /resource/metrics should report resource usage through the resource metrics api

{ failed [FAILED] Timed out after 60.006s.
Expected
    <metrics.KubeletMetrics | len:8>: 
...
to have key
    <string>: scrape_error
In [It] at: test/e2e_node/resource_metrics_test.go:121 @ 11/28/23 13:18:57.253
}

It is irrelevant to this PR, and the test has been failing for the same reason on other recent PRs, e.g. #9415 (comment)

Probably caused by the depreaction of scrape_error in this PR: https://github.com/kubernetes/kubernetes/pull/116897/files#diff-dd3c640c87eb316a6e5c6445d8914d43b7100d2366de31fa0f53f96de4294947R98. The metric is marked as deprecation in 1.29+.

Looking at the history of this test job, the test is passing on 1.29.0-Alpha (which is considered older than 1.29.0), and starts failing on v1.30.0-alpha. Fix needed on test side.

@ruiwen-zhao is that something that should be fixed on the Kubernetes e2e test side then?

Created kubernetes/kubernetes#122095 to fix the test on k/k side.

/test pull-containerd-node-e2e-1-7

So pull-containerd-node-e2e-1-7 is fixed and all tests passing now. I also fixed the double names.

Can I get some new approvals?