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

Kubernetes Submit Queue · web-flow · commit 197a7d7f8585 · 2017-10-25T10:44:04.000-07:00
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 kubernetes#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: kubernetes#54330 **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` @ixdy @pipejakob @kubernetes/sig-cluster-lifecycle-bugs @medinatiger @dims @cmluciano @dixudx
diff --git 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"],
 )
 

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ deb_data(`
`82`	`82`
`83`	`83`	`pkg_tar(`
`84`	`84`	`name = "kubernetes-cni-data",`
`85`		`- package_dir = "/opt/cni",`
	`85`	`+ package_dir = "/opt/cni/bin",`
`86`	`86`	`deps = ["@kubernetes_cni//file"],`
`87`	`87`	`)`
`88`	`88`