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

Merge pull request #26413 from mwielgus/gci-ca

Browse Source 
Automatic merge from submit-queue

Support for cluster autoscaler in GCE Trusty and GCI images

Fixes: #26346
Ref: #26197

cc: @fgrzadkowski  @vulpecula @piosz @jszczepkowski
This commit is contained in:
k8s-merge-robot
2016-05-27 06:58:15 -07:00
parent ae28564526 5f2695be8e
commit e7269a13ff
5 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/common.sh
View File

@@ -916,6 +916,7 @@ function kube::release::package_kube_manifests_tarball() {
mkdir -p "${dst_dir}"
local salt_dir="${KUBE_ROOT}/cluster/saltbase/salt"
cp "${salt_dir}/cluster-autoscaler/cluster-autoscaler.manifest" "${dst_dir}/"
cp "${salt_dir}/fluentd-es/fluentd-es.yaml" "${release_stage}/"
cp "${salt_dir}/fluentd-gcp/fluentd-gcp.yaml" "${release_stage}/"
cp "${salt_dir}/kube-registry-proxy/kube-registry-proxy.yaml" "${release_stage}/"