Commit Graph

24527 Commits

Author SHA1 Message Date
k8s-merge-robot
c8e5e89491 Merge pull request #20395 from jimmidyson/system-container-fix
Auto commit by PR queue bot
2016-02-06 04:06:42 -08:00
Madhusudan.C.S
e0a61c464a Add ReplicaSet e2e tests. 2016-02-06 03:46:44 -08:00
Madhusudan.C.S
48c4173f5f Enable ReplicaSets in e2e tests. 2016-02-06 03:46:17 -08:00
k8s-merge-robot
9de1b9b8c2 Merge pull request #20388 from mqliang/event-version
Auto commit by PR queue bot
2016-02-06 03:37:34 -08:00
k8s-merge-robot
30c1263b81 Merge pull request #20376 from smarterclayton/rest_error
Auto commit by PR queue bot
2016-02-06 02:15:45 -08:00
k8s-merge-robot
c2ac1bcd30 Merge pull request #20356 from mml/tuso-faster
Auto commit by PR queue bot
2016-02-06 01:48:07 -08:00
fmeng
aaea05980c change sed_opts as array 2016-02-06 16:49:35 +08:00
k8s-merge-robot
b45a94bc78 Merge pull request #20765 from janetkuo/remove-podtemplate-key
Auto commit by PR queue bot
2016-02-06 00:44:47 -08:00
k8s-merge-robot
fe269474ca Merge pull request #20330 from bryk/kubernetes-dashboard
Auto commit by PR queue bot
2016-02-06 00:15:10 -08:00
k8s-merge-robot
939927fe90 Merge pull request #20277 from deads2k/pin-generator
Auto commit by PR queue bot
2016-02-05 23:41:30 -08:00
k8s-merge-robot
6c5540baae Merge pull request #20232 from mml/daemonset-warn
Auto commit by PR queue bot
2016-02-05 23:12:51 -08:00
k8s-merge-robot
474795060c Merge pull request #19806 from madhusudancs/replicaset-link-boilerplate
Auto commit by PR queue bot
2016-02-05 22:45:13 -08:00
k8s-merge-robot
1b52e0ec3a Merge pull request #20210 from jsafrane/devel/gce-tags
Auto commit by PR queue bot
2016-02-05 21:36:25 -08:00
Janet Kuo
38ae5785dc Update docs for removing UniqueLabelKey from deployment spec 2016-02-05 21:21:41 -08:00
k8s-merge-robot
e3c58293b9 Merge pull request #20197 from markturansky/check_pv_by_pvc_uid
Auto commit by PR queue bot
2016-02-05 21:06:16 -08:00
Madhusudan.C.S
4f9b8b2bfc Link all the ReplicaSet controller boilerplate together.
1. Enable replica set in controller manager.
2. Enable replica set etcd storage in master package.
3. Add replica set support to kubectl commands.
2016-02-05 21:05:10 -08:00
k8s-merge-robot
0ad6326d7f Merge pull request #20170 from pmorie/update-ads-pod
Auto commit by PR queue bot
2016-02-05 20:37:39 -08:00
k8s-merge-robot
8e56494ec5 Merge pull request #20140 from resouer/scheduler
Auto commit by PR queue bot
2016-02-05 20:08:31 -08:00
k8s-merge-robot
1eff1d52e2 Merge pull request #20033 from bparees/dockerclient_bump
Auto commit by PR queue bot
2016-02-05 19:37:22 -08:00
k8s-merge-robot
58e09b4135 Merge pull request #20621 from vishh/cadvisor-godeps
Auto commit by PR queue bot
2016-02-05 19:04:12 -08:00
Kurt Stam
4e2c82fcb1 service discovery proposal using kubernetes service annotations 2016-02-05 21:38:17 -05:00
k8s-merge-robot
fcf9c4a1e4 Merge pull request #19741 from pwittrock/syncfsmetrics
Auto commit by PR queue bot
2016-02-05 17:54:22 -08:00
Vishnu kannan
849f06c51c Updating cadvisor tag to v0.21.1
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-05 17:35:08 -08:00
Janet Kuo
bb0c5fea0e Fix test failure 2016-02-05 17:26:07 -08:00
Daniel Smith
da10ef387f Merge pull request #20761 from mikedanese/revert-20702
this is a manual reversion of #20702
2016-02-05 17:07:47 -08:00
Daniel Smith
7ec7eb3173 Merge pull request #19803 from madhusudancs/replicaset-registry
Implement ReplicaSet registry.
2016-02-05 16:52:17 -08:00
k8s-merge-robot
8163b6ce97 Merge pull request #20671 from vishh/avoid-moving-all-dockers
Auto commit by PR queue bot
2016-02-05 16:49:03 -08:00
Mike Danese
b1743a6887 this is a manual reversion of #20702
I can't revert with github which says "Sorry, this pull request couldn’t be
reverted automatically. It may have already been reverted, or the content may
have changed since it was merged."

Reverts commit: 0c191e787b
2016-02-05 16:34:02 -08:00
Janet Kuo
7e9fb97b7d Remove UniqueLabelKey from deployment spec 2016-02-05 16:21:44 -08:00
Madhusudan.C.S
0bcab9ab11 Implement ReplicaSet registry. 2016-02-05 16:14:10 -08:00
Daniel Smith
8f3eb93626 Merge pull request #20072 from smarterclayton/higher_debug
Move the loader file log level to v(6)
2016-02-05 16:03:07 -08:00
Phillip Wittrock
3de94cd23c Supply volume fs metrics to server/stats/handler.go
* Metrics will not be expose until they are hooked up to a handler
* Metrics are not cached and expose a dos vector, this must be fixed before release or the stats should not be exposed through an api endpoint
2016-02-05 16:00:24 -08:00
Daniel Smith
60cc5d10b7 Merge pull request #20013 from spxtr/fix-ssh
Retry SSH connection for E2E log gathering.
2016-02-05 15:52:34 -08:00
Daniel Smith
9b68e8ec2b Merge pull request #20269 from mqliang/sync-delta-fifo
add a HasSynced() for DeltaFIFO and FIFO, method, which is very helpful for Informer
2016-02-05 15:51:50 -08:00
Daniel Smith
5fe99f44c8 Merge pull request #20542 from mikedanese/kube-proxy-defaulting
componentconfig: move kube proxy defaulting into the exetrnal api
2016-02-05 15:51:12 -08:00
Daniel Smith
82e928d71b Merge pull request #20636 from deads2k/fix-error
fix version detection for error
2016-02-05 15:50:27 -08:00
Daniel Smith
75c1dcaacd Merge pull request #20463 from andyzheng0831/trusty-master
Support master on Ubuntu Trusty
2016-02-05 15:49:28 -08:00
Daniel Smith
f973af25fa Merge pull request #20747 from caesarxuchao/internalclientset
rename release_1_2 to internalclientset
2016-02-05 15:49:08 -08:00
k8s-merge-robot
6b20879a7f Merge pull request #20142 from bprashanth/ing_tls
Auto commit by PR queue bot
2016-02-05 15:07:09 -08:00
Jordan Liggitt
1a92b8d11d Improve serviceaccount e2e setup 2016-02-05 17:39:38 -05:00
k8s-merge-robot
5066e507ae Merge pull request #20194 from derekwaynecarr/fix_hack_test_cmd
Auto commit by PR queue bot
2016-02-05 14:39:00 -08:00
Daniel Smith
9441721fee Merge pull request #19689 from AdoHe/kubectl_label_display
kubectl add show-labels flag to make it more readable
2016-02-05 14:08:37 -08:00
Daniel Smith
1c7b5e126a Merge pull request #20609 from erictune/add-api-package
Cleanup borrowed conversion functions.
2016-02-05 14:02:30 -08:00
Chao Xu
184440f8ef rename release_1_2 to internalclientset 2016-02-05 14:02:28 -08:00
Daniel Smith
75e1451363 Merge pull request #20742 from kubernetes/revert-20615-deprecate-hostconfig-at-container-start
Revert "Deprecate HostConfig at container start"
2016-02-05 14:01:43 -08:00
Daniel Smith
b278c6acd9 Merge pull request #20565 from kubernetes/revert-20000-disable-flaky
Revert "Disable flaky test."
2016-02-05 14:01:07 -08:00
k8s-merge-robot
b4c16ef9eb Merge pull request #20205 from Random-Liu/remove-old-convert-function-and-reason-cache
Auto commit by PR queue bot
2016-02-05 13:15:36 -08:00
Nikhil Jindal
4606d1408b Merge pull request #20532 from nikhiljindal/genericServerAPIs
Moving /apis handler to generic api server
2016-02-05 13:13:57 -08:00
Paul Morie
0b82d0b491 Allow pod.Spec.ActiveDeadlineSeconds to be updateable 2016-02-05 15:58:31 -05:00
Lantao Liu
bb9457e7a3 Revert "Deprecate HostConfig at container start" 2016-02-05 12:50:35 -08:00