Alex Robinson
436b9110af
Don't run fluentd-es on GCI masters
2016-06-03 11:54:01 -04:00
k8s-merge-robot
8d57a44192
Merge pull request #26745 from andyzheng0831/docker-reg
...
Automatic merge from submit-queue
GCI/Trusty: support the Docker registry mirror
@roberthbailey @zmerlynn please review it.
cc/ @fabioy @dchen1107 @kubernetes/goog-image FYI.
cc/ @ojarjur it is very straightforward to add support for GCI, which is pretty much like the change to ContainerVM's configure-vm.sh in your original PR #25841 .
2016-06-03 07:31:10 -07:00
Andy Zheng
530bd5fea6
GCI/Trusty: support the Docker registry mirror added by #25841
2016-06-02 14:57:27 -07:00
Andy Zheng
42b299abba
GCI: correct the fix in #26363
2016-06-02 10:45:03 -07:00
Piotr Szczesniak
66fce8fe44
Added logging to file for cluster autoscaler
2016-06-02 13:51:40 +02:00
k8s-merge-robot
9336eb516b
Merge pull request #26575 from mwielgus/gke-token-src
...
Automatic merge from submit-queue
Pass /etc/gce.conf to cluster autoscaler if needed
cc: @vulpecula @piosz @jszczepkowski @fgrzadkowski
2016-06-01 09:42:45 -07:00
Andy Zheng
a47d0ce1c2
GCI: cherry-pick the fix in PR #25670
2016-05-31 21:13:15 -07:00
k8s-merge-robot
430bb9442a
Merge pull request #26048 from bprashanth/ing_master
...
Automatic merge from submit-queue
Run l7 controller on master
Fixes https://github.com/kubernetes/kubernetes/issues/23663 , needs https://github.com/kubernetes/contrib/pull/680
@roberthbailey @kubernetes/goog-cluster
2016-05-31 13:25:47 -07:00
Marcin Wielgus
1ea5718199
Pass /etc/gce.conf to cluster autoscaler if needed
2016-05-31 19:52:30 +02:00
k8s-merge-robot
3d1b1a77e4
Merge pull request #26440 from mwielgus/remove-debug-touch
...
Automatic merge from submit-queue
Remove debug from GCI cluster autoscaler setup function
cc: @piosz @fgrzadkowski
2016-05-31 02:03:15 -07:00
Prashanth Balasubramanian
c01a0583f7
Trusty deployment
2016-05-30 15:58:03 -07:00
k8s-merge-robot
1e44212890
Merge pull request #26156 from gmarek/base64
...
Automatic merge from submit-queue
Change base64 -d flag to --decode flag to make it BSD compatible
cc @roberthbailey
Fixes #25998
2016-05-29 09:45:49 -07:00
Marcin
e7c69f67f2
Remove debug from GCI cluster autoscaler setup function
2016-05-27 20:02:40 +02:00
Alex Robinson
ba3bf90448
Merge pull request #26363 from wonderfly/fix-yaml-search-path
...
GCI: Fix yaml search path
2016-05-27 09:58:03 -07:00
Marcin
5f2695be8e
Support for cluster autoscaler in GCE Trusty and GCI images
2016-05-27 12:02:20 +02:00
Daniel Wang
5cd3c01bc5
GCI: Fix yaml search path
2016-05-26 10:10:37 -07:00
Isaac Hollander McCreery
559d8b1800
Make GCI-backed masters mount srv/kubernetes and srv/sshproxy in the same place as other masters
2016-05-25 10:16:57 -07:00
Quintin Lee
3ca4c36ebc
Don't try executing bash variable in assignment.
2016-05-24 11:50:16 -07:00
Wojciech Tyczynski
e515da4545
Fix GCI after #26109 breakage
2016-05-24 14:12:30 +02:00
gmarek
cafbdba7d9
Change base64 -d flag to --decode flag to make it BSD compatible
2016-05-24 13:24:55 +02:00
Andy Zheng
6bb0a25f7a
GCI: Add support for GCP webhook authentication and authorization
2016-05-23 00:52:08 -07:00
Andy Zheng
bd293e1522
GCI: support CIDR allocator for NodeController
2016-05-23 00:52:08 -07:00
Andy Zheng
914c1d61e9
GCI: Fix a cluster initialization failure caused by gce.conf
2016-05-23 00:52:08 -07:00
Andy Zheng
f31c4f6d69
Revert "Revert "Add support for running GCI on the GCE cloud provider""
...
This reverts commit 40f53b1765
2016-05-23 00:52:08 -07:00
Daniel Smith
40f53b1765
Revert "Add support for running GCI on the GCE cloud provider"
2016-05-18 21:31:28 -07:00
Andy Zheng
a737e1eba1
Add support for running GCI on the GCE cloud provider
2016-05-18 15:15:05 -07:00
