Commit Graph

24248 Commits

Author SHA1 Message Date
Prashanth B
86b6fdf5ea Sanitize flannel config. 2016-02-07 05:19:50 +00:00
k8s-merge-robot
d001f4afea Merge pull request #20254 from hongchaodeng/plugin
Auto commit by PR queue bot
2016-02-06 13:23:43 -08:00
k8s-merge-robot
a08ac362a9 Merge pull request #19839 from madhusudancs/replicaset-e2e-enable
Auto commit by PR queue bot
2016-02-06 12:54:34 -08:00
k8s-merge-robot
257c3ad776 Merge pull request #20153 from sky-uk/fix-sg-comparison
Auto commit by PR queue bot
2016-02-06 12:25:26 -08:00
k8s-merge-robot
c6a4f8482e Merge pull request #17366 from kargakis/kubectl-conventions
Auto commit by PR queue bot
2016-02-06 11:56:48 -08:00
k8s-merge-robot
9d981b696c Merge pull request #20642 from justinsb/aws_sync_kubeup_gce_step2
Auto commit by PR queue bot
2016-02-06 11:56:47 -08:00
k8s-merge-robot
d1b7fb3025 Merge pull request #20630 from a-robinson/logparse
Auto commit by PR queue bot
2016-02-06 11:28:08 -08:00
k8s-merge-robot
17c65cee35 Merge pull request #20607 from bprashanth/svccontroller_events
Auto commit by PR queue bot
2016-02-06 10:53:27 -08:00
k8s-merge-robot
aac20ed69d Merge pull request #20600 from freehan/servicevalidation
Auto commit by PR queue bot
2016-02-06 10:23:18 -08:00
k8s-merge-robot
70946a571a Merge pull request #20571 from liggitt/service-account-e2e
Auto commit by PR queue bot
2016-02-06 09:21:57 -08:00
k8s-merge-robot
b73f83d904 Merge pull request #20546 from luxas/update_godep_arm64
Auto commit by PR queue bot
2016-02-06 08:49:17 -08:00
k8s-merge-robot
ae765ef677 Merge pull request #20543 from ArtfulCoder/kubeproxytest
Auto commit by PR queue bot
2016-02-06 08:19:39 -08:00
k8s-merge-robot
3f1c99f013 Merge pull request #20515 from mikedanese/fix-proxy-mode
Auto commit by PR queue bot
2016-02-06 07:49:30 -08:00
k8s-merge-robot
6614b833cb Merge pull request #20505 from derekwaynecarr/quantity_fix
Auto commit by PR queue bot
2016-02-06 07:18:51 -08:00
k8s-merge-robot
f769ecdabc Merge pull request #20487 from deads2k/fix-unstructured
Auto commit by PR queue bot
2016-02-06 06:49:13 -08:00
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
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
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
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