Merge pull request #54573 from luxas/luxas-kubeadm-cni-fix

Automatic merge from submit-queue (batch tested with PRs 54545, 54573). 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>. Fix kubeadm e2e CI build **What this PR does / why we need it**: This fixes kubeadm e2e tests; the tarfile was extracted to the wrong directory in #51250. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # fixes: https://github.com/kubernetes/kubernetes/issues/54330 **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` @ixdy @pipejakob @kubernetes/sig-cluster-lifecycle-bugs @medinatiger @dims @cmluciano @dixudx

Merge pull request #54573 from luxas/luxas-kubeadm-cni-fix
197a7d7f · Kubernetes Submit Queue · GitHub · e7f5d054 · cbd63cfd · 197a7d7f
Commit 197a7d7f authored Oct 25, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

BUILD build/debs/BUILD +1 -1

No files found.
--- a/build/debs/BUILD
+++ b/build/debs/BUILD
@@ -82,7 +82,7 @@ deb_data(
 pkg_tar(
    name = "kubernetes-cni-data",
-    package_dir = "/opt/cni",
+    package_dir = "/opt/cni/bin",
    deps = ["@kubernetes_cni//file"],
 )