Yu-Ju Hong
d7b9f8905f
Revert "Move node information retreival to nodeManager"
...
This reverts commit 2369cd6401
2015-09-21 11:00:04 -07:00
Yu-Ju Hong
7bdf9bfdfa
Revert "Move and fix nodeManager related unit tests"
...
This reverts commit 865dc19957
2015-09-21 10:58:54 -07:00
k8s-merge-robot
11c31aeca7
Merge pull request #14252 from thockin/exp_annot_convention
...
Auto commit by PR queue bot
2015-09-21 10:50:40 -07:00
k8s-merge-robot
843134885e
Merge pull request #12470 from simon3z/add-host-ipc
...
Auto commit by PR queue bot
2015-09-21 09:15:01 -07:00
Clayton Coleman
a02bcefa10
Allow []string to be converted to *int64
...
Not something we hit before
2015-09-21 12:02:03 -04:00
Maciej Szulik
5d3b4de435
Extended defaults for jobs.
...
Currently jobs will only default completions and parallelism. This adds
copying labels map for pod's template as selectors, similarly how it's done
in replication controller.
2015-09-21 17:18:32 +02:00
Jordan Liggitt
079d5429de
Retry service account update when adding token reference
2015-09-21 11:09:46 -04:00
k8s-merge-robot
9f93dceab1
Merge pull request #14112 from timothysc/e2e-docs
...
Auto commit by PR queue bot
2015-09-21 07:21:16 -07:00
k8s-merge-robot
1ad9aad8ab
Merge pull request #14259 from mesosphere/sttts-cleanup-task-lost
...
Auto commit by PR queue bot
2015-09-21 07:11:48 -07:00
k8s-merge-robot
979bfc0f18
Merge pull request #14167 from socaa/static-consumption
...
Auto commit by PR queue bot
2015-09-21 05:13:11 -07:00
k8s-merge-robot
1446b7c4d3
Merge pull request #14113 from piosz/gcm
...
Auto commit by PR queue bot
2015-09-21 02:44:38 -07:00
Ewa Socala
152991f06c
Static Consumption added to autoscaling_utils.go
2015-09-21 10:45:10 +02:00
gmarek
393baa5157
Allow Density to run on non-GCE/GKE provider, rename deleteTestingNS
...
function.
2015-09-21 10:43:45 +02:00
k8s-merge-robot
0525e6e1e6
Merge pull request #14121 from mesosphere/sttts-extract-suicide-code
...
Auto commit by PR queue bot
2015-09-21 01:14:00 -07:00
Dr. Stefan Schimanski
132f8892ed
Move task-lost message prefix into messages module
2015-09-21 09:51:05 +02:00
k8s-merge-robot
832370ed4f
Merge pull request #13985 from piosz/annotations
...
Auto commit by PR queue bot
2015-09-21 00:43:34 -07:00
Dr. Stefan Schimanski
9d8d0ed075
Fix missing volume writer in executor kubelet instantiation
2015-09-21 09:23:47 +02:00
Piotr Szczesniak
9a1ec3dfb5
Added GCM support for Initial Resources plugin
2015-09-21 09:01:54 +02:00
Piotr Szczesniak
767445c87f
Added google api go client to deps
2015-09-21 09:01:54 +02:00
feihujiang
c99172924c
Remove useless code about minion
2015-09-21 14:51:19 +08:00
k8s-merge-robot
c7a28d7091
Merge pull request #14198 from eparis/verify-godep
...
Auto commit by PR queue bot
2015-09-20 21:11:06 -07:00
Tim Hockin
cf1141220f
Clarify experimental annotation format
2015-09-20 21:00:41 -07:00
Daniel Martí
80a37fbca4
Fix race in lifecycle admission test
...
.State.Phase is read and written by multiple goroutines as reported by `godep
go test -race` on Go 1.5.1. Adding the mutex around the object fixes the
issue.
2015-09-20 18:45:33 -07:00
k8s-merge-robot
6dad530a1f
Merge pull request #12599 from rootfs/fc_volume
...
Auto commit by PR queue bot
2015-09-20 17:20:26 -07:00
k8s-merge-robot
568c0331b0
Merge pull request #13650 from markturansky/prov_creater
...
Auto commit by PR queue bot
2015-09-20 16:57:36 -07:00
k8s-merge-robot
cd37cd7c0a
Merge pull request #12507 from nikhiljindal/swaggerValid
...
Auto commit by PR queue bot
2015-09-19 23:26:17 -07:00
Chao Xu
1eea47ce89
import known versions in kube-version-change tool
2015-09-19 22:33:21 -07:00
k8s-merge-robot
c2f76e4ce7
Merge pull request #14106 from jszczepkowski/hpa-api
...
Auto commit by PR queue bot
2015-09-19 22:23:06 -07:00
k8s-merge-robot
8c3da5d9cc
Merge pull request #14236 from eparis/verify-generated-swagger-docs
...
Auto commit by PR queue bot
2015-09-19 18:24:19 -07:00
Eric Paris
c50cad105c
Check hack/verify-generated-swagger-docs.sh in CI
...
We weren't. And shockingly it's gotten out of date.
2015-09-19 18:37:15 -04:00
Eric Paris
c02d5117af
Merge pull request #14229 from gmarek/update-swagger-docs
...
Fix swagger docs
2015-09-19 17:34:39 -05:00
Eric Paris
6766b732a5
Update verify-godeps.sh to actually work
...
The diff was incorrect. It was doing `diff -NIaupr`. And so diff was
interpreting the argument to -I to be `aupr`. So it was not running
recursively. The fix is not so simple because there is an intentionally
broken symlink in one of the godeps. Which diff -r fails on by default.
On linux there is an options to not dereference symlink and just make
sure they point to the same thing. No so on OS X. So we have to exclude
all files called "symlink". Which thankfully there is only one of.
2015-09-19 16:55:12 -04:00
Eric Paris
c95a7470f1
Update godeps using the new -t option
...
I want to drop all _test.go files, but godep will drop dependancies for
OUR _test.go files. Which is bad. So we have to keep them until that
bug is fixed in godep...
2015-09-19 16:55:12 -04:00
Eric Paris
750cbe306e
Merge pull request #14233 from kubernetes/revert-14202-prometheus
...
Revert "Update prometheus library usage"
2015-09-19 15:37:56 -05:00
Marek Grabowski
98a971cc2e
Revert "Update prometheus library usage"
2015-09-19 22:18:15 +02:00
k8s-merge-robot
a2dcd3b78d
Merge pull request #14175 from alfred-huangjian/l7-ingress-api-type-init-version
...
Auto commit by PR queue bot
2015-09-19 12:55:30 -07:00
gmarek
a5de60f985
Fix swagger docs
2015-09-19 20:16:45 +02:00
Eric Paris
20c01f072d
Merge pull request #14202 from timstclair/prometheus
...
Update prometheus library usage
2015-09-19 10:06:13 -05:00
Jian Huang
44477b246b
Add Ingress API resource type - auto generated files
2015-09-19 17:40:52 +08:00
Jian Huang
a5e23ef5ca
Add Ingress API Resource Type for L7 loadbalancing
2015-09-19 17:40:49 +08:00
Quinton Hoole
dafb3cc7a5
Merge pull request #14224 from quinton-hoole/2015-09-18-fix-kubeproxy-e2e-regex
...
Don't run slow e2e tests in the parallel runs.
2015-09-19 01:01:51 -07:00
Quinton Hoole
62a0aba550
Fix regex to banish KubeProxy test as slow.
2015-09-19 00:59:03 -07:00
k8s-merge-robot
3d71d8f38b
Merge pull request #14220 from ghodss/replication-manager-comments
...
Auto commit by PR queue bot
2015-09-19 00:55:59 -07:00
k8s-merge-robot
83192aac45
Merge pull request #13964 from liguangbo/fix_make_ca_cert_proxy
...
Auto commit by PR queue bot
2015-09-19 00:15:54 -07:00
k8s-merge-robot
fa86f0749d
Merge pull request #14195 from mikedanese/daemon-log
...
Auto commit by PR queue bot
2015-09-18 23:33:12 -07:00
k8s-merge-robot
7425cd5a22
Merge pull request #14209 from nikhiljindal/deploymentController
...
Auto commit by PR queue bot
2015-09-18 22:51:47 -07:00
k8s-merge-robot
5de212ed29
Merge pull request #14134 from eparis/string-set-intersection
...
Auto commit by PR queue bot
2015-09-18 21:24:28 -07:00
k8s-merge-robot
3eabb81e5d
Merge pull request #14196 from mikedanese/various-job
...
Auto commit by PR queue bot
2015-09-18 20:02:09 -07:00
jiangyaoguo
e4ef28f096
generate new event cache for every event sink
2015-09-19 10:58:25 +08:00
nikhiljindal
89e9691080
Adding scale up/down code to DeploymentController
2015-09-18 19:24:16 -07:00
