Merge pull request #65313 from chuckha/cri-tools-dep

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 ```

Merge pull request #65313 from chuckha/cri-tools-dep
d0ff465b · Kubernetes Submit Queue · GitHub · 5bde5a5a · 2b8482aa · d0ff465b
Unverified Commit d0ff465b authored Jun 22, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 22, 2018
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

BUILD build/debs/BUILD +1 -0

kubeadm.spec build/rpms/kubeadm.spec +1 -0

No files found.
--- a/build/debs/BUILD
+++ b/build/debs/BUILD
@@ -160,6 +160,7 @@ k8s_deb(
        "kubelet (>= 1.8.0)",
        "kubectl (>= 1.8.0)",
        "kubernetes-cni (>= 0.5.1)",
+        "cri-tools (>= 1.11.0)",
    ],
    description = """Kubernetes Cluster Bootstrapping Tool
 The Kubernetes command line tool for bootstrapping a Kubernetes cluster.

--- a/build/rpms/kubeadm.spec
+++ b/build/rpms/kubeadm.spec
@@ -6,6 +6,7 @@ Summary: Container Cluster Manager - Kubernetes Cluster Bootstrapping Tool
 Requires: kubelet >= 1.8.0
 Requires: kubectl >= 1.8.0
 Requires: kubernetes-cni >= 0.5.1
+Requires: cri-tools >= 1.11.0
 URL: https://kubernetes.io