Commit Graph

29000 Commits

Author SHA1 Message Date
k8s-merge-robot
0e03e83592 Merge pull request #24154 from caseydavenport/network-policy-proposal
Automatic merge from submit-queue

Network policy proposal

This proposal attempts to add a v1beta API for network policy to Kubernetes, as discussed and designed within the networking SIG.

<!-- 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/24154)
<!-- Reviewable:end -->
2016-05-18 13:30:29 -07:00
Casey Davenport
872d2b71c6 NetworkPolicy proposal 2016-05-18 10:14:33 -07:00
k8s-merge-robot
3a5d53d467 Merge pull request #23430 from huangyuqi/uber-cluster-manager
Automatic merge from submit-queue

Implement the cluster-controller of kubernetes federation

This PR is the cluster-controller of kubernetes federation.
This controller of federation phase 1 just collect the status of federated clusters.
2016-05-18 10:07:27 -07:00
k8s-merge-robot
952e8302fb Merge pull request #25232 from XiaoningDing/federation-apiserver-service
Automatic merge from submit-queue

add service object without proxy

add service object without proxy

#23653

@nikhiljindal please review it, thanks.

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-05-18 05:40:27 -07:00
k8s-merge-robot
e4e6e46197 Merge pull request #24799 from thockin/validation_pt8-2
Automatic merge from submit-queue

Make IsValidLabelValue return error strings

Part of the larger validation PR, broken out for easier review and merge.  Builds on previous PRs in the series.
2016-05-18 04:08:15 -07:00
k8s-merge-robot
48c90f15c5 Merge pull request #24509 from caesarxuchao/primitive-gc
Automatic merge from submit-queue

Adding garbage collector controller

Adding the propagator and garbage processor of the gc.

Design doc is at https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/garbage-collection.md

<!-- 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/24509)
<!-- Reviewable:end -->
2016-05-18 03:14:25 -07:00
k8s-merge-robot
5ffebfa303 Merge pull request #24016 from XiaoningDing/federation-kubectl
Automatic merge from submit-queue

Federation kubectl for clusters

add federation/clusters resource to kubectl
#23653, requires #23847

<!-- 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/24016)
<!-- Reviewable:end -->
2016-05-18 02:23:07 -07:00
k8s-merge-robot
bf4f84167f Merge pull request #23567 from smarterclayton/init_containers
Automatic merge from submit-queue

Add init containers to pods

This implements #1589 as per proposal #23666

Incorporates feedback on #1589, creates parallel structure for InitContainers and Containers, adds validation for InitContainers that requires name uniqueness, and comments on a number of implications of init containers.

This is a complete alpha implementation.

<!-- 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/23567)
<!-- Reviewable:end -->
2016-05-18 00:53:30 -07:00
k8s-merge-robot
a10a62f5e7 Merge pull request #25755 from pmorie/flakes-be-gone
Automatic merge from submit-queue

Add notes about endgame for test flakes

@lavalamp as we discussed last week, sorry for the latency.
2016-05-18 00:13:45 -07:00
k8s-merge-robot
6e5db87304 Merge pull request #25717 from asalkeld/pr-template
Automatic merge from submit-queue

Explain how to close an issue within a commit message

## Pull Request Guidelines

This adds some guidance on how to close issues automatically.
2016-05-17 22:55:44 -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
k8s-merge-robot
bf8a513a6f Merge pull request #25770 from zmerlynn/fix_root_disk_size
Automatic merge from submit-queue

Fix gce/util.sh:get-master-root-disk-size

Fixes problem from #25670

```
cluster/../cluster/../cluster/gce/util.sh: line 632: [: missing `]'
```


[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-05-17 22:11:56 -07:00
Tim Hockin
66d0d87829 Make IsValidLabelValue return error strings 2016-05-17 21:36:10 -07:00
k8s-merge-robot
48748a7477 Merge pull request #25777 from david-mcmahon/fixchangelog
Automatic merge from submit-queue

Fix content for v1.3.0-alpha.4 release notes.
2016-05-17 20:04:58 -07:00
k8s-merge-robot
8b59db7b64 Merge pull request #25756 from janetkuo/e2e-fail-guestbook
Automatic merge from submit-queue

Fix e2e test failure: pull redis image from gcr instead of docker

## 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
```

Fixes #25677

cc @jayunit100 @fejta  
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-05-17 19:23:14 -07:00
Angus Salkeld
448b1d2fde Explain how to close an issue within a PR message
- updated the headline
- updated the checklist numbers (was all "1.")
- converted the instructions into a markdown comment to make it
  clearer what is an instruction.
2016-05-18 10:03:50 +10:00
k8s-merge-robot
07d1060192 Merge pull request #25765 from mtaufen/node_e2e_fix
Automatic merge from submit-queue

Remove call to setup_env from hack/e2e-node-test.sh

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

This messes with the GOPATH in a way that confuses ginkgo,
and doesn't appear to be necessary to run the tests

Removes likely unnecessary use of sudo, though it should be noted that
e2e_node_suite_test.go uses sudo to do something with locksmithd, so you
currently end up using it anyway.

Updates the error for not having ginkgo built to recommend the new vendor/
path for ginkgo, and to recommend using make instead of hack/build-go.sh

Should resolve #25682
2016-05-17 16:37:18 -07:00
David McMahon
179f89507a Fix content for v1.3.0-alpha.4 release notes. 2016-05-17 16:11:56 -07:00
Janet Kuo
e428b77cbe Fix e2e test failure: pull redis image from gcr instead of docker 2016-05-17 15:12:09 -07:00
Janet Kuo
b51782206f Generate gobindata data 2016-05-17 15:12:07 -07:00
David McMahon
088a683a2c Update CHANGELOG.md for v1.3.0-alpha.4. 2016-05-17 15:11:04 -07:00
Paul Morie
e157febfe2 Add notes about endgame for test flakes 2016-05-17 17:34:09 -04:00
Chao Xu
0cda99b8d7 fixing TestCascadingDeletion flake 2016-05-17 13:48:37 -07:00
Zach Loafman
87a8905b2c Fix gce/util.sh:get-master-root-disk-size 2016-05-17 13:43:17 -07:00
Michael Taufen
ee079c958a Remove call to setup_env from hack/e2e-node-test.sh
This messes with the GOPATH in a way that confuses ginkgo,
and doesn't appear to be necessary to run the tests

Removes likely unnecessary use of sudo, though it should be noted that
e2e_node_suite_test.go uses sudo to do something with locksmithd, so you
currently end up using it anyway.

Updates the error for not having ginkgo built to recommend the new vendor/
path for ginkgo, and to recommend using make instead of hack/build-go.sh

Should resolve #25682
2016-05-17 11:46:00 -07:00
Andy Zheng
e47f45d1a3 GCI: Fix the condition for using the default image 2016-05-17 10:53:14 -07:00
k8s-merge-robot
f3ab7b182f Merge pull request #25751 from gmarek/gatherer
Automatic merge from submit-queue

Fix resource-gatherer that never gathered resources from non-master m…
2016-05-17 10:15:36 -07:00
k8s-merge-robot
7b4851b9ae Merge pull request #21274 from derekwaynecarr/kubelet_eviction
Automatic merge from submit-queue

out of resource killing (memory)

Adds the core framework for low-resource killing in the kubelet.

Implements support for out of memory killing.

Related:
https://github.com/kubernetes/kubernetes/pull/18724

<!-- 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/21274)
<!-- Reviewable:end -->
2016-05-17 10:15:32 -07:00
gmarek
eb48166d5b Fix resource-gatherer that never gathered resources from non-master machines 2016-05-17 17:53:18 +02:00
k8s-merge-robot
a24f03c3c9 Merge pull request #25669 from deads2k/fix-npe
Automatic merge from submit-queue

prevent nil pointer when starting controllers before running the shar…

Fixes https://github.com/kubernetes/kubernetes/issues/25643.

https://github.com/kubernetes/kubernetes/pull/23795 changed initialization order, so the controller isn't guaranteed to be present at startup.

@mqliang @wojtek-t I'm pretty sure that we're not guaranteed to get back the correct `cache.Indexer` or `cache.Store` either.  I'll look at re-plumbing the `AddIndexer` path to use the same instance so that its safe to use again.
2016-05-17 07:54:12 -07:00
k8s-merge-robot
959e6ca6b1 Merge pull request #25742 from jszczepkowski/kac-nodeport-test
Automatic merge from submit-queue

Added e2e test for cluster autoscaler that verifies host ports.

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

Added e2e test for cluster autoscaler that verifies host ports.
2016-05-17 07:13:24 -07:00
Wojciech Tyczynski
9990f843cd Merge pull request #25740 from gmarek/gatherer
Prevent division by 0 error in resource-gatherer
2016-05-17 15:21:14 +02:00
Jerzy Szczepkowski
905382f7b8 Added e2e test for cluster autoscaler that verifies host ports.
Added e2e test for cluster autoscaler that verifies host ports.
2016-05-17 15:07:30 +02:00
gmarek
0848ad2201 Prevent division by 0 error in resource-gatherer 2016-05-17 14:35:48 +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
k8s-merge-robot
4f62152221 Merge pull request #25711 from bobintornado/patch-1
Automatic merge from submit-queue

Update cassandra.list

## 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)]()

Upgrade cassandra version from 34x to 35x
2016-05-17 01:56:08 -07:00
k8s-merge-robot
a57fd9adfb Merge pull request #25651 from 249043822/249043822-patch-1
Automatic merge from submit-queue

MatchingCache lock optimize
2016-05-17 01:56:03 -07:00
k8s-merge-robot
e6ada45793 Merge pull request #25576 from k82/k8s-24411-doc
Automatic merge from submit-queue

Update document for kubectl service output.

Fix for #24411, Update document for kubectl service output
2016-05-17 01:55:59 -07:00
k8s-merge-robot
576df2b300 Merge pull request #24564 from azell/newrelic-daemonset
Automatic merge from submit-queue

Newrelic daemonset

1. base64 on Mac does not support the **wrap** option. Easy to support on both Mac and Linux by using **tr** to remove the newline.
2. DaemonSet definition does not conform to latest schema:

> $ kubectl create -f ./newrelic-daemonset.yaml 
error validating "./newrelic-daemonset.yaml": error validating data: found invalid field privileged for v1.PodSecurityContext; if you choose to ignore these errors, turn validation off with --validate=false

<!-- 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/24564)
<!-- Reviewable:end -->
2016-05-17 01:55:55 -07:00
Wojciech Tyczynski
2f2d650150 Merge pull request #25667 from wojtek-t/higher_list_nodes_limit
Bump threshold for listing nodes
2016-05-17 10:46:30 +02:00
Wojciech Tyczynski
dd080de4d2 Merge pull request #25721 from wojtek-t/fix_services_in_load
Fix services in load test
2016-05-17 10:46:00 +02:00
Piotr Szczesniak
bff4e12903 Merge pull request #25722 from kubernetes/jszczepkowski-ca-bump
Bumped cluster autoscaler version.
2016-05-17 10:27:44 +02: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
Wojciech Tyczynski
022f510312 Fix services in load test 2016-05-17 09:17:51 +02:00
Adam Zell
45261f4462 The Mac version of base64 does not support the wrap option. Use tr to delete the trailing newline for Mac and Linux runs.
Move the security context tag under containers.

Run hack/update-generated-docs.sh
2016-05-17 00:14:58 -07:00
k8s-merge-robot
e43ec4c445 Merge pull request #25665 from ursuad/patch-1
Automatic merge from submit-queue

Fixed namespace name to spark-cluster

Just changed the namespace from **default** to **spark-cluster** in the spark example docs.
2016-05-16 23:49:46 -07:00