Commit Graph

28207 Commits

Author SHA1 Message Date
k8s-merge-robot
6f13b4e7ed Merge pull request #25175 from freehan/bumpcni
Automatic merge from submit-queue

bump cni version again

Need to bump again. I made a mistake on the last build.
2016-05-04 20:25:25 -07:00
Tim Hockin
00873f46fb Merge pull request #25081 from timothysc/godep_ginkgo
Update godep for ginkgo and gomega to fix file based exclusion.
2016-05-04 20:10:45 -07:00
Alex Robinson
c65a6a431e Merge pull request #25148 from a-robinson/nodetag
GCE: Prefer preconfigured node tags for firewalls, if available
2016-05-04 18:16:37 -07:00
k8s-merge-robot
9d80a047d2 Merge pull request #25109 from lavalamp/fix-time-sleep
Automatic merge from submit-queue

remove inappropriate time.Sleep

Fixes #24815

@liggitt since you added this in #8494 :)
2016-05-04 18:13:42 -07:00
Dawn Chen
e09ce3668b Merge pull request #24693 from freehan/kubenetbootstrapfix
add NetworkStatus in NetworkPlugin interface for kubelet to consume
2016-05-04 16:51:27 -07:00
Minhan Xia
174d327695 bump cni version again 2016-05-04 16:28:04 -07:00
Dawn Chen
2083582270 Merge pull request #25147 from spxtr/flaky
Mark two kubectl tests flaky.
2016-05-04 16:21:08 -07:00
Alex Robinson
b75fa08aec GCE: Prefer preconfigured node tags for firewalls, if available 2016-05-04 22:49:06 +00:00
k8s-merge-robot
83c121e921 Merge pull request #25108 from lavalamp/master
Automatic merge from submit-queue

Fix verify codecgen

Fixes #25103.
2016-05-04 14:44:16 -07:00
k8s-merge-robot
53ea2cb444 Merge pull request #25074 from AdoHe/remove_container_args
Automatic merge from submit-queue

update kubectl apply help info

Please refer #22342 for more detail. @bgrant0607 ptal. Also I have open a PR to update docs on `kuberntes.github.io`
2016-05-04 14:44:14 -07:00
k8s-merge-robot
6ecb80c441 Merge pull request #23656 from caesarxuchao/cascading-deletion-proposal
Automatic merge from submit-queue

Adding a proposal for server-side cascading deletion

@lavalamp @bgrant0607 
cc @kubernetes/sig-api-machinery @derekwaynecarr 

ref https://github.com/kubernetes/kubernetes/issues/12143 https://github.com/kubernetes/kubernetes/issues/19054 https://github.com/kubernetes/kubernetes/pull/17305 (initializer proposal)
2016-05-04 14:44:10 -07:00
Minhan Xia
04b80f7fb8 rename Status interface to GetPodNetworkStatus 2016-05-04 13:46:31 -07:00
Minhan Xia
265fdd9344 add NetworkStatus in NetworkPlugin interface for kubelet to consume 2016-05-04 13:46:31 -07:00
Eric Paris
c0bcc04b8e Merge pull request #25159 from ixdy/gcloud-fields-flag
Use --format='value()' instead of --fields with gcloud compute instances describe
2016-05-04 16:37:09 -04:00
Daniel Smith
8ac89346db Fix codecgen
* Make verify call update
* Make update's topological sort not confused about the "io" package
2016-05-04 13:01:43 -07:00
Jeff Grafton
6cd9dcba60 Use --format='value()' instead of --fields with gcloud 2016-05-04 12:32:13 -07:00
Chao Xu
b3d7297386 add a proposal for generic garbage collection 2016-05-04 11:15:59 -07:00
k8s-merge-robot
93e3df8e55 Merge pull request #24789 from wojtek-t/use_proper_codec_in_client
Automatic merge from submit-queue

Use proper codec in client
2016-05-04 11:00:04 -07:00
Joe Finney
81bb39c3c0 Mark two kubectl tests flaky. 2016-05-04 10:19:05 -07:00
k8s-merge-robot
bacb12a112 Merge pull request #25001 from gmarek/jenkins
Automatic merge from submit-queue

Default KUBEMARK_TEST_ARGS
2016-05-04 10:16:40 -07:00
k8s-merge-robot
d2f70efb90 Merge pull request #23909 from k82/k8se-cassandra-java-example
Automatic merge from submit-queue

Corrected cassandra example's indent.

No logic changed; just correct java code's indent.
2016-05-04 08:29:12 -07:00
k8s-merge-robot
1642083e60 Merge pull request #24645 from jlowdermilk/rolling-update
Automatic merge from submit-queue

kubectl rolling-update support for same image

Fixes #23497.

Enables `kubectl rolling-update --image` to the same image, adding a `--image-pull-policy` flag to remove ambiguity. This allows rolling-update to behave as an "update and/or restart" (https://github.com/kubernetes/kubernetes/issues/23497#issuecomment-212349730), or as a forced update when the same tag can mean multiple versions (e.g. `:latest`). cc @janetkuo @nikhiljindal
2016-05-04 07:24:22 -07:00
Wojciech Tyczynski
11849e232e Fix bug in json framer. 2016-05-04 15:02:07 +02:00
k8s-merge-robot
3b63b06b1b Merge pull request #24849 from fejta/flake
Automatic merge from submit-queue

Use tagged redis image for kubectl test, move json test file out of deprecated examples

Closes #24642

Changes the redis image to use the :e2e tagged version on gcr.io.

Since the examples/ subdir is deprecated in favor of the new kubernetes/kubernetes.github.io I just copied this file to test-manifests/kubectl like some other files.
2016-05-04 05:53:17 -07:00
k8s-merge-robot
963aebd3e5 Merge pull request #25123 from jlewi/jessie
Automatic merge from submit-queue

Add an entry to the salt config to allow Debian jessie on GCE.

```release-note
Add an entry to the salt config to allow Debian jessie on GCE.

As with the existing Wheezy image on GCE, docker is expected
to already be installed in the image.
```


[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-05-04 04:22:39 -07:00
k8s-merge-robot
bc010d76cc Merge pull request #24751 from krousey/meta_unstructured
Automatic merge from submit-queue

Redo Unstructured to have accessor methods

Add accessor methods that implement pkg/api/unversioned.ObjectKind,
pkg/api/meta.Object, pkg/api/meta.Type and pkg/api/meta.List.

Removed the convenience fields since writing to them was not reflected
in serialized JSON.
2016-05-04 04:22:34 -07:00
k8s-merge-robot
dcc2a400d0 Merge pull request #25115 from freehan/bumpcni
Automatic merge from submit-queue

bump cni binary
2016-05-04 03:07:06 -07:00
k8s-merge-robot
72c7dd4b95 Merge pull request #25068 from hongchaodeng/fix
Automatic merge from submit-queue

etcd3/store: userUpdate error should be returned

Minor fix.
The userUpdate error should be returned.
2016-05-04 03:07:01 -07:00
k8s-merge-robot
fee33e1a5c Merge pull request #25048 from david-mcmahon/note-in-body
Automatic merge from submit-queue

Update docs to describe new PR release-note block parsing.
2016-05-04 03:06:57 -07:00
k8s-merge-robot
981890160e Merge pull request #18724 from derekwaynecarr/eviction_policy_spec
Automatic merge from submit-queue

Kubelet pod eviction proposal

The following is a proposal for how the `kubelet` may pro-actively fail a pod in response to local compute resources being starved.  The proposal focuses on memory as a first candidate, and defines a `greedy` strategy for reclaiming starved resources on the node since it seemed easiest to describe for operators versus other options and probably satisfies a broad set of use case environments.

Putting this out now for community feedback, but anticipate some more refinement around how we report eviction configuration back to users in the `Node API`.

/cc @bgrant0607 @smarterclayton @vishh @dchen1107 @kubernetes/rh-cluster-infra @kubernetes/goog-node
2016-05-04 03:06:54 -07:00
Wojciech Tyczynski
303742ce12 Merge pull request #24723 from smarterclayton/strip_noop_imports
Protobuf generation should strip side-effect imports
2016-05-04 11:16:45 +02:00
Wojciech Tyczynski
3aadafd411 Use NegotiatedSerializer in client 2016-05-04 10:57:36 +02:00
Wojciech Tyczynski
b4c83022e3 Add NegotiatedSerializer to config 2016-05-04 10:02:58 +02:00
Jeremy Lewi
ccf4b381db Add an entry to the salt config to allow Debian jessie on GCE.
As with the existing Wheezy image on GCE, docker is expected
to already be installed in the image.
2016-05-03 22:17:38 -07:00
AdoHe
036ac359d1 update kubectl apply help info 2016-05-03 22:50:24 -04:00
k8s-merge-robot
43b644ea6f Merge pull request #24998 from spxtr/remove-test-history
Automatic merge from submit-queue

Move test-history code into the test-infra repository.

~~Waiting on https://github.com/kubernetes/test-infra/pull/3~~ ready to go
2016-05-03 17:41:24 -07:00
k8s-merge-robot
4cf9754968 Merge pull request #20439 from gtank/kubelet-tls-bootstrap
Automatic merge from submit-queue

Add proposal for kubelet TLS bootstrap

A proposal based on the discussion of issue #18112, to implement a process by which kubelets can obtain TLS certificates in a streamlined manner.
2016-05-03 17:41:20 -07:00
Minhan Xia
87c66c517d bump cni binary 2016-05-03 17:18:26 -07:00
Daniel Smith
d1de30cd6c remove inappropriate time.Sleep 2016-05-03 16:37:28 -07:00
k8s-merge-robot
56d1afba5c Merge pull request #25089 from janetkuo/test-convention-doc
Automatic merge from submit-queue

Update testing convention docs

@bgrant0607 @kubernetes/docs 
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-05-03 16:34:40 -07:00
George Tankersley
5a65bb0044 docs: correct csr resource prefix 2016-05-03 14:20:24 -07:00
Kris
28132be07e Redo Unstructured to have accessor methods
Add accessor methods that implement pkg/api/unversioned.ObjectKind,
pkg/api/meta.Object, pkg/api/meta.Type and pkg/api/meta.List.

Removed the convenience fields since writing to them was not reflected
in serialized JSON.
2016-05-03 14:07:28 -07:00
k8s-merge-robot
be21fe786b Merge pull request #25095 from ihmccreery/kube-push-broken
Automatic merge from submit-queue

Mark kube-push.sh as broken

Per discussion on #17397.
2016-05-03 12:32:21 -07:00
David McMahon
3118b0c6c4 Update docs to describe new PR release-note block parsing. 2016-05-03 11:45:35 -07:00
k8s-merge-robot
cfd7a99fe3 Merge pull request #25046 from dlorenc/boilerplate
Automatic merge from submit-queue

Add several arguments to boilerplate.py

This commit makes the root directory and boilerplate content directory configurable.

The defaults have remained the same, so no behavior changes should be expected.

cc @eparis 
ref https://github.com/kubernetes/minikube/pull/37
2016-05-03 11:26:29 -07:00
k8s-merge-robot
c66250dd0d Merge pull request #24548 from pwittrock/kubectl
Automatic merge from submit-queue

Delete unused helpers
2016-05-03 11:26:25 -07:00
k8s-merge-robot
525515f52c Merge pull request #24071 from Clarifai/gpu
Automatic merge from submit-queue

Initial design doc for AWS GPU support

This is really v0

cc @erictune @davidopp @ravigadde @Hui-Zhi @Random-Liu
2016-05-03 11:26:21 -07:00
k8s-merge-robot
946a311e7b Merge pull request #25014 from smarterclayton/broken_framing_growth
Automatic merge from submit-queue

Frame decoder was checking cap(), not len()

Resulted in bytes being missing from the streaming decoder. Update both
parts.

Required for #24789

@wojtek-t or @lavalamp while he's OOO
2016-05-03 11:26:15 -07:00
Isaac Hollander McCreery
be7209d4fc Mark kube-push.sh as broken 2016-05-03 10:53:33 -07:00
k8s-merge-robot
ae6dec6337 Merge pull request #25073 from eparis/pin-gitignore
Automatic merge from submit-queue

Begin .gitignore lines with /

In /.gitignore we have lines like `kubernetes/`. Because that line is
not anchored with `/` it ignores any directory called `kubernetes`
anywhere in the repo. This caused a problem in #24242 because the user
didn't realize that the directory in `vendor/` was being ignored.
2016-05-03 10:39:57 -07:00