From bd31a168fd5f56bb1b5a025e313946c6cc224fb0 Mon Sep 17 00:00:00 2001 From: carlory Date: Mon, 9 Feb 2026 10:39:17 +0800 Subject: [PATCH] kubelet: defer the configurations flags (and the related fallback behavior) deprecation removal timeline from 1.36 to 1.37 to align with containerd v1.7 support Signed-off-by: carlory --- cmd/kubelet/app/server.go | 2 +- test/e2e_node/cgroup_driver_from_cri_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index a2dab27e588..6dd7a519a5f 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -1408,7 +1408,7 @@ func getCgroupDriverFromCRI(ctx context.Context, s *options.KubeletServer, kubeD } // CRI implementation doesn't support RuntimeConfig, fallback legacyregistry.MustRegister(kubeletmetrics.CRILosingSupport) - kubeletmetrics.CRILosingSupport.WithLabelValues("1.36.0").Inc() + kubeletmetrics.CRILosingSupport.WithLabelValues("1.37.0").Inc() logger.Info("CRI implementation should be updated to support RuntimeConfig. Falling back to using cgroupDriver from kubelet config.") return nil } diff --git a/test/e2e_node/cgroup_driver_from_cri_test.go b/test/e2e_node/cgroup_driver_from_cri_test.go index 4b406fc8e5e..9433609f818 100644 --- a/test/e2e_node/cgroup_driver_from_cri_test.go +++ b/test/e2e_node/cgroup_driver_from_cri_test.go @@ -66,7 +66,7 @@ var _ = SIGDescribe("Cgroup Driver From CRI", feature.CriProxy, framework.WithSe samples := m[kubeletmetrics.KubeletSubsystem+"_"+kubeletmetrics.CRILosingSupportKey] gomega.Expect(samples).NotTo(gomega.BeEmpty()) - gomega.Expect(samples[0].Metric["version"]).To(gomega.BeEquivalentTo("1.36.0")) + gomega.Expect(samples[0].Metric["version"]).To(gomega.BeEquivalentTo("1.37.0")) }) ginkgo.It("should not emit metric if CRI is new enough", func() { restartKubelet(context.Background(), true)