k8s-merge-robot
085b172395
Merge pull request #24887 from nikhiljindal/runOptions
...
Automatic merge from submit-queue
Deleting duplicate code from federated-apiserver.Run()
This removes most of duplicate code from federated-apiserver.Run().
The code remaining is related to storage or authz and authn.
https://github.com/kubernetes/kubernetes/pull/24787 refactors the storage related code.
I am still figuring out authz and authn.
cc @jianhuiz
2016-05-05 06:50:56 -07:00
k8s-merge-robot
ea36708020
Merge pull request #25193 from gmarek/gather
...
Automatic merge from submit-queue
Fix units in kubemark resource gatherer
2016-05-05 06:16:43 -07:00
k8s-merge-robot
ca830803f2
Merge pull request #25187 from wojtek-t/configure_proto_for_test_clusters
...
Automatic merge from submit-queue
Configure proto for test clusters
ref #25132
@smarterclayton - FYI
2016-05-05 06:16:40 -07:00
gmarek
78331db78d
Fix units in kubemark resource gatherer
2016-05-05 14:10:21 +02:00
k8s-merge-robot
c79c5864e7
Merge pull request #25051 from spxtr/fix-1.6.2
...
Automatic merge from submit-queue
Use v1.6.2-1 tag for build.
Is there any reason these don't use the VERSION file like everything else? cc @luxas @ixdy
2016-05-05 03:36:27 -07:00
Jan Chaloupka
59fc509fb7
e2e/framework/util.StartPods: don't wait for pods that are not created
2016-05-05 12:28:03 +02:00
k8s-merge-robot
0e2ecb7ac6
Merge pull request #24694 from vulpecula/local-ssd-configure-2
...
Automatic merge from submit-queue
Support local SSDs for GKE and GCE nodes.
```release-note
Support local SSDs for GKE and GCE nodes.
```
2016-05-05 02:24:34 -07:00
k8s-merge-robot
3faf214506
Merge pull request #24924 from mqliang/pv-prepare-update
...
Automatic merge from submit-queue
fix PrepareForUpdate bug for PV and PVC
2016-05-05 01:46:21 -07:00
Piotr Szczesniak
caa96f4cf3
Merge pull request #25133 from jayunit100/c2fix
...
flake fix for cassandra:cassandra
2016-05-05 10:00:00 +02:00
Piotr Szczesniak
0aeedb759c
Merge pull request #24253 from piosz/master-metrics-proposal
...
Resource Metrics API proposal
2016-05-05 09:56:54 +02:00
liang chenye
3c9306e521
fix #24937 : flake pod not found
...
Signed-off-by: liang chenye <liangchenye@huawei.com>
2016-05-05 15:29:28 +08:00
Piotr Szczesniak
d3f43cc4c3
Resource Metrics API proposal
2016-05-05 08:57:29 +02:00
Wojciech Tyczynski
7ed573cf66
Enable configuring content type in tests
2016-05-05 08:46:21 +02:00
Chao Xu
4562a26d34
generated changes
2016-05-04 21:54:55 -07:00
Chao Xu
a46b7775fc
API changes for finalizers and system-wide garbage collector
2016-05-04 21:54:55 -07:00
k8s-merge-robot
9b5795dd55
Merge pull request #24979 from humblec/patch-1
...
Automatic merge from submit-queue
Update Dockerfile
## 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
```
[]()
Exposing 24008 is not required as glusterd listens on 24007 port.
2016-05-04 21:26:34 -07:00
k8s-merge-robot
67b8a3dd16
Merge pull request #24776 from tnachen/autoscaler_docs
...
Automatic merge from submit-queue
Add docs for podautoscaler package
Add missing docs for podautoscaler package in controllers.
2016-05-04 21:26:31 -07:00
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
Prashanth Balasubramanian
6bc3052551
PetSet alpha controller
2016-05-04 18:39:17 -07:00
mqliang
0109c08b9b
fix PrepareForUpdate bug for HPA
2016-05-05 09:39:03 +08: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
jay vyas
7a824aaf49
Cassandra de-flake
2016-05-04 21:11:56 -04: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
Hongchao Deng
3144ebc7fc
start etcd compactor in background
2016-05-04 16:01:03 -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
Jeff Grafton
6a0c152476
Map secret files into dockerized e2e
2016-05-04 12:29:04 -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
Dan Williams
aad6535a00
kubenet: fix up CNI bridge TX queue length if needed
...
CNI's bridge plugin mis-handles the TxQLen when creating the bridge,
leading to a zero-length TX queue. This doesn't typically cause
problems (since virtual interfaces don't have hard queue limits)
but when adding traffic shaping, some qdiscs pull their packet
limits from the TX queue length, leading to a packet limit of 0
in some cases. Until we can depend on a new enough version of
CNI, fix up the TX queue length internally.
2016-05-04 10:14:40 -05:00
Wojciech Tyczynski
25164537ef
ref
2016-05-04 16:53:59 +02: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
Jan Safranek
71796b7098
e2e: Enable persistent volume test
...
The test is already there and all packages should be already available on all
test machines (namely: mount.nfs).
It tests:
- binding
- using bound claim in a pod
- recycling NFS volume
2016-05-04 13:53:39 +02: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.
```
[]()
2016-05-04 04:22:39 -07:00
