Commit Graph

980 Commits (015bc3d60d9ae3f8bb4b6cdc615d23ed086c28ba)

Author SHA1 Message Date
Zach Loafman 20408cad17 Bump GCE debian image to container-v1-3-v20160604
Includes Docker 1.11.2

Wait for enough results from
http://kubekins.dls.corp.google.com/job/kubernetes-e2e-gce-container-vm/
before merging.

c.f. https://github.com/kubernetes/test-infra/pull/116
2016-06-04 20:46:46 -07:00
k8s-merge-robot e0707b137f Merge pull request #26827 from Random-Liu/re-enable-node-problem-detector
Automatic merge from submit-queue

Re-enable node problem detector by default

Re-enable node problem detector started in gce cluster by default.

For now, in the master node, the node problem detector will be started and do nothing (see https://github.com/kubernetes/node-problem-detector/pull/13).

But in fact, in my test cluster, the master has no extra cpu to run the node problem detector, so node problem detector is started on all nodes except master, which is what we want but not expected...

@dchen1107 
/cc @kubernetes/sig-node 
/cc @andyzheng0831 for the gci script change.

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-04 12:33:58 -07:00
k8s-merge-robot b91af0fab9 Merge pull request #26785 from a-robinson/es-master
Automatic merge from submit-queue

Don't run fluentd-es on GCI masters

It isn't run on containervm masters. It can't do anything on the master because the master doesn't have kube-proxy running to enable fluentd to talk to the elasticsearch service.

@andyzheng0831
2016-06-04 08:22:18 -07:00
k8s-merge-robot 60fe00999b Merge pull request #26779 from bryk/release-beta2
Automatic merge from submit-queue

Set Dashboard UI version to v1.1.0-beta2

This is our second beta. Next will come weekly till we reach final v1.1 version.

https://github.com/kubernetes/dashboard/releases/tag/v1.1.0-beta2

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-04 06:46:17 -07:00
Random-Liu 7dffea0dc0 Re-enable node problem detector by default 2016-06-03 17:47:50 -07:00
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
k8s-merge-robot 9023955bb7 Merge pull request #26737 from andyzheng0831/gci-path
Automatic merge from submit-queue

GCI: correct the fix in #26363

This PR is mainly for correcting the fix to 'find' command in #26363. I added "-maxdepth 1" in an earlier change, and #26363 tried to fix it by changing the search path. This is potentially incorrect, when yaml files are in more than one layer deep. The real fix should be removing the "-maxdepth 1" flag from 'find' command. This PR also updates two minor places in the file configure-helper.sh introduced by two previous PR #26413 and #26048.

@roberthbailey @wonderfly 

cc/ @dchen1107 @fabioy @kubernetes/goog-image
2016-06-03 06:41:20 -07:00
bryk f734d8b786 Set Dashboard UI version to v1.1.0-beta1
This is our second beta. Next will come weekly till we reach final v1.1 version.

https://github.com/kubernetes/dashboard/releases/tag/v1.1.0-beta2
2016-06-03 15:34:42 +02:00
k8s-merge-robot 1ad3e11a59 Merge pull request #26582 from adityakali/ark.docker1.11
Automatic merge from submit-queue

pin GCI version to milestone 52

This is mainly for pinning the 1.2 branch to GCI milestone 52
which contains correct docker and kubelet built in.
Doing this allows us to upgrade docker to v1.11 (issue #26455)
in GCI 53 without breaking the 1.2 release branch.

@kubernetes/goog-image @dchen1107 @roberthbailey @andyzheng0831
2016-06-03 02:05:30 -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 f087a3f677 Trusty: fix 'find' commands and add k8s license and motd info 2016-06-02 14:35:44 -07:00
Aditya Kali f7c2624849 pin GCI version to milestone 52
This is mainly for pinning the 1.2 branch to GCI milestone 52
which contains correct docker and kubelet built in.
Doing this allows us to upgrade docker to v1.11 (issue #26455)
in GCI 53 without breaking the 1.2 release branch.
2016-06-02 13:52:38 -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 0274e72d39 Merge pull request #26316 from wonderfly/defaults
Automatic merge from submit-queue

Move the defaults setting of GCI to util.sh

fixes #26291 

This change recovers some of the side effects of
https://github.com/kubernetes/kubernetes/pull/26197, i.e., keeps the defaults of
`NODE_IMAGE` and `NODE_IMAGE_PROJECT` to `MASTER_IMAGE` and
`MASTER_IMAGE_PROJECT`, for backward compatibility. Although it keeps
`OS_DISTRIBUTION` defaulting to `gci`, the default settings of these vars are
moved to `cluster/gce/util.sh` and conditioned on `OS_DISTRIBUTION==gci`.

@euank @roberthbailey Can you review?
2016-06-02 00:22:04 -07:00
k8s-merge-robot 365386e23b Merge pull request #26617 from sjpotter/heapster
Automatic merge from submit-queue

cluster/coreos: Update heapster addon to beta2

fixes #26616 

As noted there, heapster was updated but not for gce/coreos which breaks anything that depends on heapster's new metrics API (i.e. autoscaling)
2016-06-01 18:50:56 -07:00
Daniel Wang a8701baf17 Move the defaults setting of GCI to util.sh
This change recovers some of the side effects of
https://github.com/kubernetes/kubernetes/pull/26197, i.e., keeps the defaults of
`NODE_IMAGE` and `NODE_IMAGE_PROJECT` to `MASTER_IMAGE` and
`MASTER_IMAGE_PROJECT`, for backward compatibility. Although it keeps
`OS_DISTRIBUTION` defaulting to `gci`, the default settings of these vars are
moved to `cluster/gce/util.sh` and conditioned on `OS_DISTRIBUTION==gci`.
2016-06-01 15:37:02 -07:00
Shaya Potter 049c51e7e7 removed --metric_resolution=60s per piosz 2016-06-01 12:00:35 -07:00
Andy Zheng 9a413b3bea Trusty: fix breakage by #26413 and #26109 2016-06-01 09:57:50 -07: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
Shaya Potter 4118bb1cf9 update heapster to beta2 - change to rest of k8s wasn't applied here 2016-06-01 00:51:52 -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
Marcin 74ad0def81 Add missing $ in util.sh 2016-05-31 19:41:54 +02:00
k8s-merge-robot dc8ff81f5a Merge pull request #26534 from mwielgus/scale_down_env
Automatic merge from submit-queue

Allow to enable scale down in kube-up for gce

cc: @piosz @fgrzadkowski @jszczepkowski
2016-05-31 04:37:11 -07: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
Marcin 0b7c2fa6fe Allow to enable scale down in kube-up for gce 2016-05-30 17:07:54 +02: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
Alex Robinson 804e36be26 Merge pull request #26157 from gmarek/poll
Remove unused POLL_SLEEP_INTERVAL
2016-05-27 11:30:41 -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
k8s-merge-robot e7269a13ff Merge pull request #26413 from mwielgus/gci-ca
Automatic merge from submit-queue

Support for cluster autoscaler in GCE Trusty and GCI images

Fixes: #26346
Ref: #26197

cc: @fgrzadkowski  @vulpecula @piosz @jszczepkowski
2016-05-27 06:58:15 -07:00
Marcin 5f2695be8e Support for cluster autoscaler in GCE Trusty and GCI images 2016-05-27 12:02:20 +02:00
Alex Mohr 1dfa068055 Merge pull request #26384 from Random-Liu/disable-node-problem-detector
Temporarily disable node-problem-detector to unblock #26351
2016-05-26 15:53:50 -07:00
Alex Mohr 0b7614d6cd Merge pull request #26382 from dchen1107/docker
Bump Node Image to  container-v1-3-v20160517
2016-05-26 15:53:22 -07:00
Random-Liu e5320c6063 Temporarily disable node-problem-detector to unblock #26351 2016-05-26 14:06:05 -07:00
Dawn Chen 16662d8fb4 Bump Node Image to container-v1-3-v20160517 2016-05-26 13:30:56 -07:00
Alex Mohr 0f3003671c Merge pull request #25963 from bryk/release-beta1
Set Dashboard UI version to v1.1.0-beta1
2016-05-26 12:38:48 -07:00
Daniel Wang 5cd3c01bc5 GCI: Fix yaml search path 2016-05-26 10:10:37 -07:00
k8s-merge-robot bb38265400 Merge pull request #26238 from ihmccreery/mount-points
Automatic merge from submit-queue

GCI-backed masters mount srv/kubernetes and srv/sshproxy in the right place

Fixes #26235.

cc @andyzheng0831
2016-05-25 23:46:08 -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
k8s-merge-robot 1fc5687715 Merge pull request #25784 from bprashanth/prepull
Automatic merge from submit-queue

Prepull images in e2e 

Quick and dirty image puller because the SQ stalled multiple times just *today* on image pull flake (https://github.com/kubernetes/kubernetes/issues/25277).
@kubernetes/sig-node @kubernetes/sig-testing wdyt?
2016-05-25 01:50:35 -07:00
Daniel Wang 3d95151971 Replace containervm with GCI as default master image for GCE clusters 2016-05-24 17:28:17 -05:00
Quintin Lee 3ca4c36ebc Don't try executing bash variable in assignment. 2016-05-24 11:50:16 -07:00
k8s-merge-robot 04d6162e0f Merge pull request #26071 from gmarek/kube-up
Automatic merge from submit-queue

Make node-instance-group base names unique to prevent collisions

We create multiple IGMs for >1000 Node clusters. When we have a conflict on base name IGMs will fight over ownership of the VM that happen to have the name belonging to multiple IGMs.

This change will increase reliability of starting big clusters.

cc @wojtek-t @alex-mohr @roberthbailey @mikedanese
2016-05-24 07:31:22 -07:00
Wojciech Tyczynski e515da4545 Fix GCI after #26109 breakage 2016-05-24 14:12:30 +02:00
gmarek 049d7f6c50 Remove unused POLL_SLEEP_INTERVAL 2016-05-24 13:34:03 +02:00