Merge pull request kubernetes#22818 from andyzheng0831/enhance

Auto commit by PR queue bot (cherry picked from commit f8bb10b)
eparis · Mar 24, 2016 · 3e9daa2 · 3e9daa2
1 parent 570b3bb
commit 3e9daa2
Show file tree

Hide file tree

Showing 6 changed files with 747 additions and 726 deletions.
diff --git a/build/common.sh b/build/common.sh
@@ -947,6 +947,7 @@ function kube::release::package_kube_manifests_tarball() {
   cp "${salt_dir}/kube-addons/namespace.yaml" "${release_stage}/trusty"
   cp "${salt_dir}/kube-addons/kube-addons.sh" "${release_stage}/trusty"
   cp "${salt_dir}/kube-addons/kube-addon-update.sh" "${release_stage}/trusty"
+  cp "${KUBE_ROOT}/cluster/gce/trusty/configure-helper.sh" "${release_stage}/trusty"
   cp -r "${salt_dir}/kube-admission-controls/limit-range" "${release_stage}/trusty"
   local objects
   objects=$(cd "${KUBE_ROOT}/cluster/addons" && find . \( -name \*.yaml -or -name \*.yaml.in -or -name \*.json \) | grep -v demo)