Commit Graph

3841 Commits (b4da46974c47dabbdfe9f99c7662a645e0b22290)

Author SHA1 Message Date
nikhiljindal b4da46974c Updating federation up script to create a secret with federation-apiserver kubeconfig 2016-06-07 14:21:04 -07:00
Dawn Chen 3acf04dded Merge pull request #26851 from zmerlynn/container-v1-3-v20160604
Bump GCE debian image to container-v1-3-v20160604
2016-06-06 11:04:46 -07:00
k8s-merge-robot fc11ca60db Merge pull request #25454 from gouyang/add_local_util_tool
Automatic merge from submit-queue

Add local/util.sh
2016-06-06 01:51:20 -07:00
Guohua Ouyang 0970bbf799 Add local/util.sh
Fix #25452
2016-06-06 14:45:06 +08:00
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
Josh Ellithorpe 07f8d025c8
Remove SecurityContextDeny from aws configurations 2016-06-04 15:52:10 -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 714db74611 Merge pull request #26783 from a-robinson/newlogs
Automatic merge from submit-queue

Add collection of the new glbc and cluster-autoscaler logs

I've incremented the version numbers by 2 to avoid conflicting with #26652. I'll make sure the potential conflict between the images gets resolved reasonably.

cc @piosz @bprashanth @aledbf
2016-06-04 07:35:33 -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
k8s-merge-robot 57125d81e1 Merge pull request #26621 from liyimeng/kolla-k8s
Automatic merge from submit-queue

Fix the problem in building hyperkube for 3rd party registry

Minor bugfix.  fixes #26620



[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-04 04:23:31 -07:00
Prashanth Balasubramanian 44ca220f32 Bump kube-dns image 2016-06-03 20:41:13 -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
Alex Robinson bb51c94172 Add collection of the new glbc and cluster-autoscaler logs 2016-06-03 15:50:52 +00: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 15c9ecb5be Merge pull request #26734 from bprashanth/glbc_limits
Automatic merge from submit-queue

Increase failure threshold for glbc liveness probe

This pod fails a liveness probe on occasion, probably because the failure thresholds are too strict. Simple enough that either reviewer can review.
2016-06-03 05:44:58 -07: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
Prashanth Balasubramanian bd5467bbbb Increase failure threshold for glbc 2016-06-02 14:05:37 -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 431040afd8 Merge pull request #26650 from a-robinson/es-image
Automatic merge from submit-queue

Rebuild elasticsearch image to include changes since 1.2

Fixes #25360. I've pushed the image to GCR.

@jimmidyson @keontang @vishh
2016-06-02 01:59:40 -07:00
k8s-merge-robot 878d2b2f18 Merge pull request #26625 from sttts/sttts-fix-kube-dns-sed-transform
Automatic merge from submit-queue

Fix sed transformation for new kube-dns yaml

<!--
Checklist for submitting a Pull Request

Please remove this comment block before submitting.

1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md).
2. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md).
3. If you want this PR to automatically close an issue when it is merged,
   add `fixes #<issue number>` or `fixes #<issue number>, fixes #<issue number>`
   to close multiple issues (see: https://github.com/blog/1506-closing-issues-via-pull-requests).
4. Follow the instructions for [labeling and writing a release note for this PR](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes) in the block below.
-->

```release-note
* Use the release-note-* labels to set the release note state 
* Clear this block to use the PR title as the release note 
-OR-
* Enter your extended release note here
```


[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-02 01:12:53 -07: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 63e589957e Merge pull request #26664 from zmerlynn/parallel-firewall
Automatic merge from submit-queue

GKE provider: Tear down firewall rules last

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]() It turns out, it's faster to do it in this order for large clusters.

Along the way: Do it in parallel
2016-06-01 18:51:07 -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
Zach Loafman 9e23fa0e9b GKE provider: Tear down firewall rules last
It turns out, it's faster to do it in this order for large clusters.

Along the way: Do it in parallel
2016-06-01 15:37:20 -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
Alex Robinson 8579509293 Rebuild elasticsearch image to include changes since 1.2 2016-06-01 20:48:20 +00: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
k8s-merge-robot cb91816fc3 Merge pull request #26612 from andyzheng0831/gci-fix
Automatic merge from submit-queue

GCI: cherry-pick the fix in PR #25670

This PR simply copies the fix in #25670 into the GCI support.

cc/ @kubernetes/goog-image @dchen1107 @roberthbailey
2016-06-01 06:55:57 -07:00
k8s-merge-robot 0c0478e3f5 Merge pull request #26593 from bprashanth/glbc_logs
Automatic merge from submit-queue

Collect l7 controller e2e logs

https://github.com/kubernetes/kubernetes/pull/26048#issuecomment-222758050
I meant to check e2e output and see if the logs were being collected, but it merged before i could.
2016-06-01 06:55:54 -07:00
Marcin Wielgus fcea41e495 Merge pull request #26577 from mwielgus/ca-0.1.1
Bump cluster autoscaler to 0.1.1
2016-06-01 15:41:36 +02:00
Dr. Stefan Schimanski 391ff02e4c Fix sed transformation for new kube-dns yaml 2016-06-01 13:23:16 +02:00
Liyi Meng 6c195a4923 Fix the problem in building hyperkube for 3rd party registry 2016-06-01 04:38:48 -04: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 ee412efcef Merge pull request #26335 from girishkalele/kubedns-transition
Automatic merge from submit-queue

Switch DNS addons from skydns to kubedns

Change GCI and trusty cluster-helper scripts to use kubedns instead of skydns.
2016-05-31 16:14:48 -07:00
Prashanth Balasubramanian 500bdca27c Collect l7 controller e2e logs 2016-05-31 14:44:30 -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
Girish Kalele 555b9000c3 Code review comments and corrections 2016-05-31 11:33:51 -07:00
Marcin 246f3aaebc Bump cluster autoscaler to 0.1.1 2016-05-31 20:00:00 +02:00
Marcin Wielgus 1ea5718199 Pass /etc/gce.conf to cluster autoscaler if needed 2016-05-31 19:52:30 +02:00