Ensure ListMetricDescriptors gets tested with latest k/k

Signed-off-by: Davanum Srinivas <davanum@gmail.com>

diff --git a/.github/workflows/node-e2e.yml b/.github/workflows/node-e2e.yml
index 976e73cf897b935bd2947968b0471b4e15288579..1e24109374be7d66facc92a4b68511b9b1367aee 100644 (file)
--- a/.github/workflows/node-e2e.yml
+++ b/.github/workflows/node-e2e.yml
@@ -108,12 +108,10 @@ jobs:
       - name: Run Node E2E Tests
         working-directory: ./src/k8s.io/kubernetes
         run: |
-          # TODO: Remove "ResourceMetrics" feature skip once containerd supports ListMetricDescriptors:
-          # https://github.com/kubernetes/kubernetes/blob/v1.33.2/test/e2e_node/resource_metrics_test.go#L67-L71
           sudo make test-e2e-node \
             FOCUS='\[NodeConformance\]|\[Feature:.+\]|\[Feature\]' \
             SKIP='\[Flaky\]|\[Slow\]|\[Serial\]|\[Feature:UserNamespacesSupport\]|\[Feature:PodLifecycleSleepActionAllowZero\]|\[Feature:UserNamespacesPodSecurityStandards\]|\[Feature:KubeletCredentialProviders\]|\[Feature:LockContention\]|\[Feature:SCTPConnectivity\]|\[Feature:ResourceMetrics\]|\[Alpha\]' \
-            TEST_ARGS='--kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service"'
+            TEST_ARGS='--feature-gates=PodAndContainerStatsFromCRI=true --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service --feature-gates=PodAndContainerStatsFromCRI=true"'
 
       - name: Collect Logs on Failure
         if: failure()