github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-16 14:45:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17243 from yifan-gu/gce_coreos

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-27 13:02:20 -08:00
parent 4f845ad6e1 723402c4e9
commit a95f1b84cb
41 changed files with 1802 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/common.sh
View File

@@ -899,7 +899,8 @@ function kube::release::package_kube_manifests_tarball() {
# Source 2: manifests from cluster/gce/kube-manifests.
# TODO(andyzheng0831): Enable the following line after finishing issue #16702.
# cp "${KUBE_ROOT}/cluster/gce/kube-manifests/"* "${release_stage}/"
# cp "${KUBE_ROOT}/cluster/gce/kube-manifests/*" "${release_stage}/"
cp -r "${KUBE_ROOT}/cluster/gce/coreos/kube-manifests"/* "${release_stage}/"
kube::release::clean_cruft