mirror of https://github.com/k3s-io/k3s
d0ff465b1c
Automatic merge from submit-queue (batch tested with PRs 65301, 65291, 65307, 63845, 65313). 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>. Adds cri-tools as a dependency to kubeadm deb/rpms Closes kubernetes/kubeadm#942 Signed-off-by: Chuck Ha <ha.chuck@gmail.com> **What this PR does / why we need it**: This PR adds cri-tools as a dependency to kubeadm. Kubeadm code now requires crictl to exist on the system or an ignorable error will be thrown during init. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes kubernetes/kubeadm#942 **Special notes for your reviewer**: I'm making a similar PR in the release repo as well. **Release note**: ```release-note NONE ``` |
||
|---|---|---|
| .. | ||
| 10-kubeadm.conf | ||
| BUILD | ||
| OWNERS | ||
| cri-tools.spec | ||
| kubeadm.spec | ||
| kubectl.spec | ||
| kubelet.env | ||
| kubelet.service | ||
| kubelet.spec | ||
| kubernetes-cni.spec | ||