mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-30 23:14:30 +00:00
Automatic merge from submit-queue (batch tested with PRs 53592, 52562, 55175, 55213). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Work around heapster panic For https://github.com/kubernetes/kubernetes/issues/54962. Work around https://github.com/kubernetes/kubernetes/issues/54962 for now. It is blocking the cri-containerd cluster e2e test, and it seems that heapster update takes time. @yujuhong @yguo0905 ```release-note none ```