github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-17 11:28:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #136846 from carlory/update-cri-losing-support

Browse Source 
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
This commit is contained in:
Kubernetes Prow Robot
2026-02-11 09:26:15 +05:30
committed by GitHub
parent 9dc55d7d9e bd31a168fd
commit 90a76aaa9a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubelet/app/server.go
View File

@@ -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
}

2
test/e2e_node/cgroup_driver_from_cri_test.go
View File

@@ -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)