Commit Graph

3717 Commits (f9355072357fb33ac561aa4cc5b53adfaa64f9e3)

Author SHA1 Message Date
k8s-merge-robot f935507235 Merge pull request #19242 from mqliang/node-controller
Automatic merge from submit-queue

add CIDR allocator for NodeController

This PR:

* use pkg/controller/framework to watch nodes and	reduce lists when allocate CIDR for node
* decouple the cidr allocation logic from monitoring status logic

<!-- Reviewable:start -->
---
This change is [<img src="http://reviewable.k8s.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](http://reviewable.k8s.io/reviews/kubernetes/kubernetes/19242)
<!-- Reviewable:end -->
2016-05-20 09:45:05 -07:00
Filip Grzadkowski 18e67573b8 Merge pull request #25739 from piosz/heapster-1.1.0-beta2
Bumped Heapster to v1.1.0-beta2
2016-05-20 15:41:54 +02:00
mqliang 17d5a302bb make podcidr mask size configurable 2016-05-20 20:44:40 +08:00
mqliang cf7a3475f3 Don't allow node controller to allocate into service CIDR range 2016-05-20 20:44:40 +08:00
Filip Grzadkowski 2f2b7c8c97 Merge pull request #25734 from jszczepkowski/kac-test
Added enforcing of setting nodes numbers for cluster autoscaler.
2016-05-20 10:28:56 +02:00
Filip Grzadkowski d1627111b3 Merge pull request #25767 from johscheuer/fix-hyperkube-makefile-2
Hyperkuber Makefile add support for OSX and Linux
2016-05-20 10:28:06 +02:00
Wojciech Tyczynski b294979d00 Revert "Bump GCE ContainerVM to container-v1-3-v20160517 (Docker 1.11.1)" 2016-05-20 09:02:11 +02:00
Daniel Smith 1a64ae88b7 Merge pull request #25843 from zmerlynn/container-v1-3-v20160517
Bump GCE ContainerVM to container-v1-3-v20160517 (Docker 1.11.1)
2016-05-19 16:57:13 -07:00
Piotr Szczesniak eea3a4e5fb Bumped Heapster to v1.1.0-beta2 2016-05-19 20:43:30 +02:00
Tim Hockin 77eff06a53 Make IsDNS1123Label return error strings 2016-05-19 08:57:49 -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
Daniel Smith 01cf9869fc Merge pull request #25504 from andyzheng0831/binary
GCI: Ensure that the right version of kubelet is used
2016-05-18 15:04:32 -07:00
k8s-merge-robot 51203dad7a Merge pull request #25763 from andyzheng0831/gci-image
Automatic merge from submit-queue

GCI: Fix the condition for using the default image

This PR revises the condition for using the default GCI image. The old logic is not convenient for manually run e2e tests in some cases (mainly for GCI team to test custom images). The new logic by this PR is very similar to the logic in using ContainerVM. When setting distro to "gci", if master or node image is unset, we use gci-dev for it. If either is set, we respect it.

@roberthbailey @zmerlynn @dchen1107 please review it, and we should cherry pick it in release-1.2 branch. Thanks!

cc/ @kubernetes/goog-image @adityakali FYI
2016-05-17 22:55:41 -07:00
Zach Loafman 4d551d640d Bump GCE ContainerVM to container-v1-3-v20160517
Bump to Docker 1.11.1
2016-05-17 14:52:16 -07:00
Zach Loafman 87a8905b2c Fix gce/util.sh:get-master-root-disk-size 2016-05-17 13:43:17 -07:00
Johannes Scheuermann cb11324cc3 Add support for OSX and Linux 2016-05-17 21:31:32 +02:00
Andy Zheng e47f45d1a3 GCI: Fix the condition for using the default image 2016-05-17 10:53:14 -07:00
Jerzy Szczepkowski 858eb0388e Added enforcing of setting nodes numbers for cluster autoscaler.
Added enforcing of setting nodes numbers for cluster autoscaler in kube-up script.
2016-05-17 13:15:49 +02:00
k8s-merge-robot 1738bbfe5f Merge pull request #25693 from luxas/fix_hyperkube
Automatic merge from submit-queue

Fix hyperkube's layer caching, and remove --make-symlinks at build time

@david-mcmahon This is required before you release. Explanation in the code.
2016-05-17 04:01:43 -07:00
k8s-merge-robot 7c1d37bdb5 Merge pull request #24464 from matthewrudy/aws-ap-northeast2
Automatic merge from submit-queue

AWS: More support for ap-northeast-2 region

Issue #24446

The new AWS region for Seoul, Korea (ap-northeast-2)
was launched in January 2016
https://aws.amazon.com/blogs/aws/now-open-aws-asia-pacific-seoul-region/

But it requires a few changes.

To test:
```
export KUBERNETES_PROVIDER=aws
export KUBE_AWS_ZONE=ap-northeast-2a
export MASTER_SIZE=t2.medium
export NODE_SIZE=t2.medium
export NUM_NODES=4
cluster/kube-up.sh
```

I assigned the AMIs by checking the specific version used from `ap-northeast-1`,
and finding the same image with the same datestamp.

<!-- Reviewable:start -->
---
This change is [<img src="http://reviewable.k8s.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](http://reviewable.k8s.io/reviews/kubernetes/kubernetes/24464)
<!-- Reviewable:end -->
2016-05-17 04:01:39 -07:00
Jerzy Szczepkowski 57425bd44d Bumped cluster autoscaler version.
Bumped cluster autoscaler version.
2016-05-17 09:44:48 +02:00
k8s-merge-robot b7151cf4cd Merge pull request #25706 from andyzheng0831/find-cmd
Automatic merge from submit-queue

GCI/Trusty: Fix an issue in using 'find' commands

This PR makes the logic of 'find' command consistent with the 'cp' command afterwards, i.e., only check one layer of a given dir. Without this fix, we have seen a recent breakage after PR #25309 added the file cluster/addons/fluentd-elasticsearch/es-image/template-k8s-logstash.json. The 'find' command discovers this json file, but the 'cp' command fails. 

@roberthbailey @dchen1107 @zmerlynn please review this fix, and mark it as a cherry pick candidate. I already verified this fix can resolve the breakage.

cc/ @wonderfly @fabioy @kubernetes/goog-image FYI
2016-05-17 00:42:11 -07:00
k8s-merge-robot ae15eff4ac Merge pull request #25687 from mattyw/01-fix-url-in-charm-readme
Automatic merge from submit-queue

cluster/juju: Updated the url for the getting started doc

Minor change to update the URL pointing at the "Running Kubernetes locally via Docker" document
2016-05-17 00:42:07 -07:00
k8s-merge-robot ced2b65046 Merge pull request #25609 from andyzheng0831/log
Automatic merge from submit-queue

GCI: Enable the log of upstart jobs

This PR enables the log of upstart jobs in master.yaml and node.yaml. By default, log of upstart jobs are enabled in Trusty and placed in /var/log/upstart, but not enabled in GCI. This change explicitly directs the log to the system logger. For trusty, they are in /var/log/syslog file. In GCI, we can check it using "journalctl". This change will be useful for debugging if cluster initialization fails.

@roberthbailey @maisem @dchen1107 please review it. This will be useful for issues like #23634. We should also cherry pick it in release-1.2

cc/ @fabioy @zmerlynn @wonderfly FYI.
2016-05-17 00:42:03 -07:00
k8s-merge-robot 059980e3d9 Merge pull request #25670 from gmarek/root-disk
Automatic merge from submit-queue

Make bigger master root disks in GCE for large clusters

Ref. #25660

cc @zmerlynn @wojtek-t
2016-05-16 23:06:22 -07:00
Andy Zheng f8739cd0c2 GCI:Trusty: Fix an issue in using 'find' commands 2016-05-16 17:48:29 -07:00
k8s-merge-robot 11cd07ef22 Merge pull request #25366 from Jollyturns/ubuntu-download-latest
Automatic merge from submit-queue

Automatically download the latest stable release version of Kubernetes.

The ubuntu version of download-release.sh included in the binary release downloads the released .tar.gz file again. Right now the version of the downloaded file is manually encoded within the script. This change fetches the released version automatically, similar to the shell script available on the main Kubernetes site below:

https://get.k8s.io/

Ideally the installation on bare metal ubuntu should work with the files available in the already downloaded package.

@mikedanese
2016-05-16 16:59:37 -07:00
Lucas Käldström e7eff87455 Critical patch. Fix hyperkube's layer caching, and remove --make-symlinks at build time 2016-05-17 00:28:24 +03:00
Ovidiu Predescu dd203087ef Automatically download the latest stable release version of
Kubernetes. Echo error to stderr. Simplify expression for
KUBE_VERSION. Explicitly match beginning of string.
2016-05-16 13:52:10 -07:00
mattyw 3c44752931 cluster/juju: Updated the url for the getting started doc 2016-05-16 20:56:17 +01:00
David McMahon 57247a672b Revert "OS X: Fix hyperkube build by adding empty string to sed invocation" 2016-05-16 12:25:54 -07:00
gmarek 64618c3311 Make bigger master root disks in GCE for large clusters 2016-05-16 15:57:56 +02:00
k8s-merge-robot a0cc59f28a Merge pull request #25658 from jszczepkowski/kac-test
Automatic merge from submit-queue

Updated e2e tests for cluster autoscaling.

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

Updated e2e tests for cluster autoscaling to work with the new cluster autoscaler.
2016-05-16 06:56:30 -07:00
Jerzy Szczepkowski 96818874f4 Updated e2e tests for cluster autoscaling.
Updated e2e tests for cluster autoscaling to work with the new cluster autoscaler.
2016-05-16 14:49:43 +02:00
k8s-merge-robot 61f383e5d1 Merge pull request #23785 from ajohnstone/23784-aws-vpc-key-error
Automatic merge from submit-queue

AWS kube-down: don't fail if ELB not in VPC - #23784

Prevent python undefined key error.

```
Traceback (most recent call last):
  File "<string>", line 1, in <module>
KeyError: 'VPCId'
```

Fixes #23784

<!-- Reviewable:start -->
---
This change is [<img src="http://reviewable.k8s.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](http://reviewable.k8s.io/reviews/kubernetes/kubernetes/23785)
<!-- Reviewable:end -->
2016-05-16 01:45:49 -07:00
k8s-merge-robot 7fdfe1b387 Merge pull request #25309 from keontang/es-patch
Automatic merge from submit-queue

add index template for es aggregations

This index template helps us to do es aggregations of namespace_name, pod_name and container_name. Then after doing eggs, we will get the whole name not all the spilt pieces.  
fix #25127
2016-05-16 01:01:24 -07:00
k8s-merge-robot 1cba05574b Merge pull request #25619 from skrassiev/bug/aws_invalid_endpoint_24020
Automatic merge from submit-queue

Fixed 'Invalid endpoint: https://ec2.us-east-.amazonaws.com'. #24420 #24420

Addresses:

- https://github.com/kubernetes/kubernetes/issues/24020

- https://github.com/kubernetes/kubernetes/issues/24420
2016-05-16 00:04:04 -07:00
k8s-merge-robot c044b5e93b Merge pull request #25402 from kubevirt/master
Automatic merge from submit-queue

Add nfs support for vagrant nodes.

## Pull Request Guidelines

1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md).
1. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md).
1. 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)]()

This will allow to use NFS volumes on those nodes
2016-05-16 00:04:00 -07:00
keontang 1520a01d97 Fixed #25127 2016-05-16 09:03:00 +08:00
k8s-merge-robot aada051b20 Merge pull request #25357 from mwielgus/ca-salt
Automatic merge from submit-queue

Salt configuration for the new Cluster Autoscaler for GCE

Adds support for cloud autoscaler from contrib/cloud-autoscaler in kube-up.sh GCE script.

cc: @fgrzadkowski @piosz
2016-05-15 11:35:19 -07:00
k8s-merge-robot 87403cfe7b Merge pull request #25173 from ixdy/gcloud-grep-awk-cut
Automatic merge from submit-queue

Use --format='value(name)' with gcloud instead of grep/awk/cut

Fixing our fragile parsing of `gcloud` is getting old (#24746, #25159, maybe others?).

Instead, let's just get the proper output out of `gcloud` in the first place.
2016-05-15 07:46:28 -07:00
Alexander Krassiev be2633a0a1 Fixed 'Invalid endpoint: https://ec2.us-east-.amazonaws.com'. #24420 #24020 2016-05-14 11:08:04 -07:00
Andy Zheng 45baf1e7cf GCI: Enable logs for upstart jobs 2016-05-13 22:29:24 -07:00
Jeff Lowdermilk e7ab3a39d1 Merge pull request #25518 from euank/cluster-common-python3
cluster: make gen-uid python3 compatible
2016-05-13 15:07:46 -07:00
Jeff Lowdermilk 4abb50ee70 Merge pull request #25397 from thockin/build-non-root-prep
Make it possible to use kube-cross as non-root
2016-05-13 10:33:02 -07:00
Matthew Rudy Jacobs 895e44405c Add configuration for AWS ap-northeast-2 region
Added AWS_IMAGEs from https://cloud-images.ubuntu.com/locator/
2016-05-14 01:15:55 +08:00
Jeff Lowdermilk c0e12f2f96 Merge pull request #25299 from andyzheng0831/yaml
GCI/Trusty: Support the new var in glbc.yaml
2016-05-13 10:12:23 -07:00
Jeff Lowdermilk f4c9624c1a Merge pull request #25197 from oszi/expose-etcd-ports
Expose commonly used ports in the etcd image
2016-05-13 10:08:33 -07:00
Jeff Lowdermilk 1d67b6ca81 Merge pull request #24617 from pnegahdar/dn_server_config
Allow DNS_SERVER_IP and DNS_DOMAIN to be configurable in GCE deploy
2016-05-13 10:05:36 -07:00