github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
20,589 Commits
32 Branches
881 Tags
633 MiB
Commit Graph

8656 Commits (2c00037883ea9054185071c713704ba286501023)

Author SHA1 Message Date
k8s-merge-robot 456220ff1a Merge pull request #16637 from lavalamp/go2idl.2 
Auto commit by PR queue bot
 2015-11-04 03:33:27 -08:00
k8s-merge-robot 2842d9476b Merge pull request #16496 from wojtek-t/switch_cacher_for_other_resources 
Auto commit by PR queue bot
 2015-11-04 03:01:24 -08:00
huangyuqi 1bf2f869c7 add valid resource types for kubectl get 2015-11-04 10:12:30 +00:00
k8s-merge-robot ac63290ff5 Merge pull request #16781 from timothysc/fix-testing-deps 
Auto commit by PR queue bot
 2015-11-04 01:58:34 -08:00
jiangyaoguo 39858db29e add new event when infra-container change 2015-11-04 17:04:32 +08:00
jiangyaoguo 3ce5a51007 remove implicitly required container event 2015-11-04 16:47:17 +08:00
mqliang f26d437903 move assignment in loop 2015-11-04 15:42:25 +08:00
k8s-merge-robot 859f75f436 Merge pull request #15264 from yujuhong/work_queue 
Auto commit by PR queue bot
 2015-11-03 22:51:18 -08:00
k8s-merge-robot 5ff0e128ad Merge pull request #16752 from markturansky/remove_nfs_cansupport_binary_check 
Auto commit by PR queue bot
 2015-11-03 22:19:15 -08:00
Timothy St. Clair dbdd1614e6 Fix for linkage issue with new testing utilities 2015-11-03 22:16:47 -06:00
eulerzgy 287b9e8978 Add warning log 2015-11-04 10:55:43 +08:00
feihujiang c39faf19f3 Move rest handler of subresources of pod to rest package 2015-11-04 10:23:49 +08:00
nikhiljindal 61cef8f570 Updating typeToJSON to handle pointers as well 2015-11-03 17:31:40 -08:00
Daniel Smith 241551e36e set-gen example 2015-11-03 15:14:51 -08:00
Janet Kuo b8f97dd185 Remove unhelpful output when jsonpath and template printers fail to print 2015-11-03 15:09:00 -08:00
k8s-merge-robot bad838f35c Merge pull request #16717 from liggitt/hpa_ref_validation 
Auto commit by PR queue bot
 2015-11-03 15:04:30 -08:00
Nikhil Jindal 34cbe48736 Merge pull request #16690 from nikhiljindal/apiDeclNotFound 
Fixing missing swagger spec for apis/extensions
 2015-11-03 14:36:31 -08:00
Kris 05182fc7d5 Properly defaulting the status in log code 2015-11-03 14:34:45 -08:00
k8s-merge-robot c24873743f Merge pull request #16664 from wojtek-t/remove_fake_client_from_cacher 
Auto commit by PR queue bot
 2015-11-03 13:48:35 -08:00
Yu-Ju Hong 2eb17df46b kubelet: independent pod syncs and backoff on error 
Currently kubelet syncs all pods every 10s. This is not preferred because
 * Some pods may have been sync'd recently.
 * This may cause all the pods to be sync'd at once, causing undesirable
   CPU spikes.

This PR replaces the global syncs with independent, periodic pod syncs. At the
end of syncing, each pod worker will enqueue itslef with a future timestamp (
current time + sync interval), when it will be due for another sync.
 * If the pod worker encoutners an sync error, it may requeue with a different
   timestamp to retry sooner.
 * If a sync is triggered by the update channel (events or spec changes), the
   pod worker would enqueue a new sync time.

This change is necessary for moving to long or no periodic sync period once pod
lifecycle event generator is completed. We will still rely on the mechanism to
requeue the pod on sync error.

This change also makes sure that if a sync does not succeed (either due to
real error or the per-container backoff mechanism), an error would be propagated
back to the pod worker, which is responsible for requeuing.
 2015-11-03 13:29:08 -08:00
markturansky d3bb6575fb Revert "nfs: check if /sbin/mount.nfs* is present in CanSupport()" 
This reverts commit 1b3a88dc87.
 2015-11-03 16:09:57 -05:00
Jordan Liggitt b3157d1445 Ensure HPA has valid resource/name/subresource, validate path segments 2015-11-03 14:46:17 -05:00
Paul Morie 09701b4fa8 Surface replica count update errors in log 2015-11-03 14:20:08 -05:00
Paul Morie 75b1e6ec44 Fix panic bringing up e2e cluster when kubeconfig is empty 2015-11-03 11:19:36 -05:00
k8s-merge-robot c8fe00b94f Merge pull request #16711 from liggitt/remotecommand_error 
Auto commit by PR queue bot
 2015-11-03 06:43:37 -08:00
k8s-merge-robot 121f33068d Merge pull request #16668 from deads2k/fix-hpa-escalation 
Auto commit by PR queue bot
 2015-11-03 06:11:34 -08:00
k8s-merge-robot 3f3918048a Merge pull request #16669 from erictune/fix-run-docstring 
Auto commit by PR queue bot
 2015-11-03 05:29:29 -08:00
deads2k fd1c8e096a eliminate cross-namespace HPA escalation attack 2015-11-03 08:05:26 -05:00
k8s-merge-robot 1b437272ba Merge pull request #16696 from janetkuo/kubectl-jsonpath 
Auto commit by PR queue bot
 2015-11-03 04:29:28 -08:00
k8s-merge-robot 76083f73dc Merge pull request #16671 from DirectXMan12/refactor/hpa-heapster-service 
Auto commit by PR queue bot
 2015-11-03 03:58:26 -08:00
Wojciech Tyczynski 030a272db5 Enable cacher for all resources. 2015-11-03 11:55:37 +01:00
k8s-merge-robot fe2d44e842 Merge pull request #16653 from Random-Liu/remove-unused-type 
Auto commit by PR queue bot
 2015-11-03 02:45:22 -08:00
k8s-merge-robot f371b3d891 Merge pull request #16621 from timstclair/metrics-lite 
Auto commit by PR queue bot
 2015-11-03 02:13:19 -08:00
Wojciech Tyczynski 6246201eec Remove fakeClient from cacher_test. 2015-11-03 10:58:43 +01:00
wulonghui 86abfb8d16 Delete all files and all hidden files without . & .. error for PV recycler 2015-11-03 17:34:25 +08:00
k8s-merge-robot b79379516f Merge pull request #16584 from wojtek-t/refactor_use_cacher 
Auto commit by PR queue bot
 2015-11-03 01:10:13 -08:00
k8s-merge-robot f276572034 Merge pull request #16570 from liggitt/proxy_request_info 
Auto commit by PR queue bot
 2015-11-03 00:33:10 -08:00
k8s-merge-robot c080c8a14f Merge pull request #16537 from fabianofranz/attach_handles_tty_support 
Auto commit by PR queue bot
 2015-11-03 00:01:38 -08:00
k8s-merge-robot c1d380db94 Merge pull request #16693 from Random-Liu/put-termination-message-path-into-docker-label 
Auto commit by PR queue bot
 2015-11-02 23:29:35 -08:00
k8s-merge-robot 5681bacef4 Merge pull request #16710 from feihujiang/addCommentNamespaceClearedForRootscopedResources 
Auto commit by PR queue bot
 2015-11-02 22:57:30 -08:00
k8s-merge-robot 990c0184be Merge pull request #16330 from mikedanese/deploy-ptr 
Auto commit by PR queue bot
 2015-11-02 20:41:34 -08:00
Jordan Liggitt ddae749111 Read error from failed upgrade attempts 2015-11-02 22:39:58 -05:00
feihujiang f7bfb04665 Add a comment that not return an error for rootscoped resources with namesapce 2015-11-03 11:00:01 +08:00
Janet Kuo 4d92268212 Better error handling for output format when "kubectl config view" 2015-11-02 16:25:52 -08:00
Lantao Liu 894dc5a5a2 Move TerminationMessagePath into docker label. 2015-11-02 14:32:58 -08:00
nikhiljindal 7612bded3e Removing an erroneous / 2015-11-02 14:18:57 -08:00
Wojciech Tyczynski 8f385c563f Refactor code for creating Cacher. 2015-11-02 20:56:46 +01:00
Lantao Liu eff4533efc Move findPodContainer to docker_test.go 2015-11-02 09:49:07 -08:00
Tim St. Clair 5cd5b80f9e Set up new "metrics" API group. 
This commit only adds 2 placeholder structs to the API, for the purposes
of separating the API group setup from the API discussion.
 2015-11-02 09:49:02 -08:00
k8s-merge-robot 17e36b02f4 Merge pull request #16660 from mqliang/DelFmt 
Auto commit by PR queue bot
 2015-11-02 09:41:20 -08:00
Solly Ross f262560cac Customize HPA Heapster service namespace/name 
This commit makes the HPA metrics client configurable in where
it looks for heapster instead of hard coding it to
"kube-system/heapster".  The values of "kube-system/heapster"
are still recorded as constants in the metrics client package
for use as default values.
 2015-11-02 11:14:08 -05:00
Fabiano Franz c60f19a1f8 Attach must only allow a tty when container supports it 2015-11-02 09:56:58 -05:00
mqliang 3afcbae1a8 remove unnecessary fmt 2015-11-02 21:07:07 +08:00
feihujiang 3603b14977 Move service strategy to registry/service package 2015-11-02 19:56:03 +08:00
huangyuqi b69b498235 use the defined constant variable 2015-11-02 15:32:53 +08:00
Lantao Liu b127901871 Remove unused type DockerContainers. 
Type DockerContainers and function FindPodContainer() are never used.
Remove them to simplify the docker runtime api.
 2015-11-01 18:49:05 -08:00
k8s-merge-robot 4383e6f95c Merge pull request #13146 from mikedanese/config-api 
Auto commit by PR queue bot
 2015-10-31 17:01:32 -07:00
k8s-merge-robot e355710ece Merge pull request #16639 from feihujiang/makeRootscopedResourceNamespaceSelectableFieldNotAllowed 
Auto commit by PR queue bot
 2015-10-31 16:29:30 -07:00
Mike Danese 67f46aa1f1 autogenerated 2015-10-31 12:26:54 -07:00
Mike Danese 9bdb860eeb add apigroup installer and tests 2015-10-31 11:42:38 -07:00
Mike Danese 82111a7cb5 add component config api group 2015-10-31 11:42:38 -07:00
k8s-merge-robot 7b8bf758f3 Merge pull request #16631 from dchen1107/docker 
Auto commit by PR queue bot
 2015-10-31 10:55:37 -07:00
feihujiang 726def04d5 Make rootscoped resource no namespace selectable field 2015-10-31 10:52:21 +08:00
k8s-merge-robot d1345a1f4f Merge pull request #16502 from wojtek-t/list_from_memory 
Auto commit by PR queue bot
 2015-10-30 19:47:10 -07:00
Dawn Chen d2805c65d6 Fix Kubelet /logs endpoint 2015-10-30 16:19:34 -07:00
Eric Tune 0bde95f1ce Fix incorrect flag in example. 2015-10-30 15:40:05 -07:00
Alex Robinson 0eb7243b95 Merge pull request #15994 from dchen1107/docker 
Failed docker health check and mark the node NotReady when docker version is below 1.6.2 (API ve…
 2015-10-30 15:39:04 -07:00
Dawn Chen a39e1e96dc Mark NodeNotReady for docker version below 1.6.2 2015-10-30 13:48:51 -07:00
Dawn Chen b691fd299c Failed docker health check when docker version is below 1.6.2 (API version: 1.18) 2015-10-30 13:48:50 -07:00
Alex Robinson 97275873ff Merge pull request #16591 from kubernetes/revert-15838-issue14500 
Revert "An attempt to fix flake in TestControllerSyncJob (14500)"
 2015-10-30 13:14:05 -07:00
Wojciech Tyczynski 652fb090eb Initial support for listing from in-memory cache. 2015-10-30 20:58:13 +01:00
k8s-merge-robot eb140495ab Merge pull request #16414 from Random-Liu/put-podname-into-label 
Auto commit by PR queue bot
 2015-10-30 12:45:25 -07:00
k8s-merge-robot a9534bfd33 Merge pull request #16441 from liggitt/helper_codec 
Auto commit by PR queue bot
 2015-10-30 11:29:17 -07:00
k8s-merge-robot 9e16b1dec9 Merge pull request #16589 from wojtek-t/list_options_in_clients 
Auto commit by PR queue bot
 2015-10-30 10:58:15 -07:00
Jordan Liggitt 600b5e633d Fix GetRequestInfo subresource parsing for proxy/redirect verbs 2015-10-30 13:41:49 -04:00
Alex Robinson 887b9dd78a Merge pull request #16232 from bprashanth/salt 
Cluster-loadbalancing addon
 2015-10-30 09:45:16 -07:00
Alex Robinson 21a75abfbd Merge pull request #16489 from mqliang/deleteFmt 
replace `fmt.Sptintf()` with naive string appending
 2015-10-30 09:25:39 -07:00
Eric Tune a600ac0cca Revert "An attempt to fix flake in TestControllerSyncJob (14500)" 2015-10-30 08:56:11 -07:00
Huamin Chen a31d23ea0e don't use ext4 mkfs options for other fs 
Signed-off-by: Huamin Chen <hchen@redhat.com>
 2015-10-30 11:53:10 -04:00
Wojciech Tyczynski aac55d4795 Unify List() signature in clients 2015-10-30 15:43:40 +01:00
k8s-merge-robot cc53619372 Merge pull request #15791 from abutcher/set-service 
Auto commit by PR queue bot
 2015-10-30 06:55:16 -07:00
k8s-merge-robot 36bae67910 Merge pull request #16548 from ArtfulCoder/kube-proxy-mem-use 
Auto commit by PR queue bot
 2015-10-30 06:23:14 -07:00
k8s-merge-robot 8a6020ef62 Merge pull request #16544 from smarterclayton/enable_log_with_tail 
Auto commit by PR queue bot
 2015-10-30 05:03:35 -07:00
k8s-merge-robot 55246db600 Merge pull request #16491 from wojtek-t/merge_to_options_in_storage 
Auto commit by PR queue bot
 2015-10-30 04:30:17 -07:00
k8s-merge-robot 536740f38f Merge pull request #16443 from brendandburns/lb2 
Auto commit by PR queue bot
 2015-10-30 02:05:11 -07:00
David Oppenheimer 899ddc66eb Merge pull request #16478 from mikedanese/ds-nodeready 
daemonset don't place pods on notready nodes
 2015-10-30 01:07:28 -07:00
k8s-merge-robot bbba223584 Merge pull request #16445 from smarterclayton/improve_errors 
Auto commit by PR queue bot
 2015-10-30 00:17:18 -07:00
k8s-merge-robot a86d8780f8 Merge pull request #16082 from caesarxuchao/discover-1.0-server-new 
Auto commit by PR queue bot
 2015-10-29 23:45:16 -07:00
hurf 3d7dd82bf6 Clean trace of "Minion" 
Trivial change, remove "minion" in message.
 2015-10-30 14:35:08 +08:00
Lantao Liu b3585a5209 Move docker label related functions into labels.go and add pod name, pod namespace and pod uid into docker label 2015-10-29 22:42:25 -07:00
Brendan Burns 604203595a Fix a bug where nodes that weren't schedulable or ready are added to load balancers 2015-10-29 22:05:08 -07:00
k8s-merge-robot 0e7f2288f5 Merge pull request #16494 from soltysh/issue16255 
Auto commit by PR queue bot
 2015-10-29 15:48:17 -07:00
Abhishek Shah 5367a32ee9 Read Iptables-save output in a more-memory-efficient way 2015-10-29 15:30:00 -07:00
Clayton Coleman 2335bfa351 Allow Docker container logs to be tail'd and follow'd 
Relaxes the very very ancient restriction we put in place to keep the
original API surface area PR small. Better to be consistent with actual
expected use of tail.
 2015-10-29 17:12:38 -04:00
k8s-merge-robot c4b32cc8d8 Merge pull request #16223 from timstclair/status-deadlock 
Auto commit by PR queue bot
 2015-10-29 13:01:31 -07:00
Prashanth Balasubramanian 122dccbffa Kubectl describe 2015-10-29 12:09:31 -07:00
k8s-merge-robot f4b2d8358f Merge pull request #16179 from madhusudancs/master-out-of-disk 
Auto commit by PR queue bot
 2015-10-29 11:57:25 -07:00
k8s-merge-robot 1ecda94f0a Merge pull request #15305 from mqliang/deamonSetList 
Auto commit by PR queue bot
 2015-10-29 11:25:52 -07:00
Mike Danese f237db81f0 daemonset don't place pods on notready nodes 2015-10-29 11:11:20 -07:00
krousey 848fed8f4b Merge pull request #16384 from derekwaynecarr/fix_memory_churn_etcd_helper 
Large amount of memory churn in etcd helper prefixing keys
 2015-10-29 10:02:07 -07:00
Maciej Szulik e662b34ccd Remove dead pods upon stopping a job 2015-10-29 17:56:01 +01:00
Chao Xu 69932aecb0 Let discoveryClient use RESTClient; 
Ignore 403 and 404 error when discovering server-supported group/version
 2015-10-29 09:55:32 -07:00
Andrew Butcher 0c4aafaf1e Update master service ports and type via controller. 2015-10-29 10:56:46 -04:00
Wojciech Tyczynski 9c53f301f1 Merge selectors with ListOptions. 2015-10-29 15:42:57 +01:00
k8s-merge-robot 55d03fd102 Merge pull request #16332 from janetkuo/fix-print-job 
Auto commit by PR queue bot
 2015-10-29 06:43:26 -07:00
k8s-merge-robot 45028e8c3d Merge pull request #14493 from BugRoger/fix_devicemapping_cache_invalidation 
Auto commit by PR queue bot
 2015-10-29 06:43:10 -07:00
k8s-merge-robot cd7e4bd6bb Merge pull request #16364 from liggitt/unversioned_types 
Auto commit by PR queue bot
 2015-10-29 05:56:17 -07:00
k8s-merge-robot d5be3635e5 Merge pull request #16273 from wojtek-t/list_options_in_api 
Auto commit by PR queue bot
 2015-10-29 01:57:29 -07:00
mqliang 5b03cfc92b replace fmt.Sptintf() with + operator 2015-10-29 16:27:42 +08:00
k8s-merge-robot f8eb75669b Merge pull request #16482 from fabianofranz/remove_stdin_from_completions 
Auto commit by PR queue bot
 2015-10-29 01:26:27 -07:00
k8s-merge-robot c8a1783724 Merge pull request #15323 from swagiaal/pod-volume-selinux 
Auto commit by PR queue bot
 2015-10-28 19:17:32 -07:00
Fabiano Franz d9161cb3b5 stdin is not a valid file extension for bash completions 2015-10-29 00:00:34 -02:00
k8s-merge-robot 0f99c59da1 Merge pull request #16413 from ddysher/controller-manager-start 
Auto commit by PR queue bot
 2015-10-28 18:36:29 -07:00
Tim St. Clair 9a2089adc8 Concurrency fixes in status.Manager 
- Fix deadlock when syncing deleted pods with full update channel
- Prevent sending stale updates to API server
- Don't delete cached status when sync fails (causes problems for prober)
 2015-10-28 17:40:55 -07:00
Madhusudan.C.S ce257b5a0e Use node out of disk condition in the scheduler while scheduling pods. 
Set the out of disk node condition to unknown in the node controller if
the kubelet does not report its node condition in a long time. Update
node controller unit tests.

Implement a node condition predicate function that checks if a given
node satisfies the conditions defined by the predicate and if it
does, use that node for scheduling pods. The predicate function takes
both NodeReady and NodeOutOfDisk into consideration to determine if a
node is fit for scheduling pods.

The predicate is then passed to the node lister in the scheduler factory
so that the node lister can run the predicate function on the nodes when
schedling pods thereby omitting nodes that does not satisfy the
predicate.

Also update listers test.
 2015-10-28 14:29:46 -07:00
Clayton Coleman 6f688c3df8 Improve the message for UsageError 
Capitalize, also indicate that we have examples
 2015-10-28 13:33:37 -04:00
Jordan Liggitt b58e62e7d4 Pass runtime.Object to Helper.Create/Replace 2015-10-28 12:43:21 -04:00
Deyuan Deng 638411d744 Wait apiserver in controller manager startup process 2015-10-29 00:15:33 +08:00
Wojciech Tyczynski 579fa74977 Add test for TimeoutSeconds parameter 2015-10-28 15:48:36 +01:00
Sami Wagiaalla 1d352a16b8 Support volume relabling for pods which specify an SELinux label 2015-10-28 09:26:58 -04:00
Jerzy Szczepkowski 1524d7490a Merge pull request #16294 from aveshagarwal/master-fix-code-duplication 
Fixes code duplication.
 2015-10-28 13:23:06 +01:00
k8s-merge-robot ffe92cc4d4 Merge pull request #16182 from timothysc/etcd-remove-fakeclient-part2 
Auto commit by PR queue bot
 2015-10-28 02:02:01 -07:00
Mike Danese 6bbc2448c9 autogenerated 2015-10-28 00:13:40 -07:00
Mike Danese b0a41108af move deployment PodTemplate to be not a pointer 2015-10-28 00:13:40 -07:00
k8s-merge-robot d695177229 Merge pull request #16054 from smarterclayton/revert_extension_syntax 
Auto commit by PR queue bot
 2015-10-27 19:57:15 -07:00
k8s-merge-robot d228fd6d9c Merge pull request #15809 from mikedanese/deploy 
Auto commit by PR queue bot
 2015-10-27 19:25:12 -07:00
k8s-merge-robot ec9b493647 Merge pull request #14639 from gmarek/hollow-proxy 
Auto commit by PR queue bot
 2015-10-27 18:22:38 -07:00
k8s-merge-robot a1fd0536cd Merge pull request #13980 from aveshagarwal/iptables-proxy-cleanup 
Auto commit by PR queue bot
 2015-10-27 17:45:35 -07:00
Daniel Smith 3f3ca480be Merge pull request #16080 from yujuhong/reset_defaults 
Add custom pod conversion functions from pre-v1.1 mirror pods
 2015-10-27 15:47:34 -07:00
Daniel Smith 6219b50280 Merge pull request #16160 from kargakis/windows-fixes-for-edit 
edit: Windows fixes
 2015-10-27 15:44:26 -07:00
Daniel Smith 424afd4cfb Merge pull request #15971 from jlowdermilk/client-http-content-type 
Set Content-Type in headers of client http requests
 2015-10-27 15:33:32 -07:00
Daniel Smith 8524d392bf Merge pull request #16178 from madhusudancs/kubelet-out-of-disk-no-master 
Report node out of disk condition in the kubelet.
 2015-10-27 14:28:03 -07:00
derekwaynecarr caebe7300b Large amount of memory churn in etcd helper 2015-10-27 16:35:07 -04:00
k8s-merge-robot 0a7a9f3535 Merge pull request #16340 from timstclair/flaky-prober 
Auto commit by PR queue bot
 2015-10-27 12:10:22 -07:00
Timothy St. Clair 4cf5b348c8 Removal of fakeClient from etcd_watcher_test in leiu of NewEtcdTestClientServer 2015-10-27 13:32:56 -05:00
Yu-Ju Hong e5c82d2292 Add custom pod conversion functions from pre-v1.1 mirror pods 
The functions would default values added after v1.0, so that kubelet wouldn't
fail at comparing the mirror pods against their associated static pods.

This code would need to be maintained if we ever change the default value in
Pod until we drop support for v1.0 nodes.
 2015-10-27 10:50:30 -07:00
gmarek 5a4e4d4d57 Add a HollowProxy to the HollowNode. 2015-10-27 18:23:29 +01:00
Avesh Agarwal e1837185de Improves iptables cleanup for pure iptables based proxier. 2015-10-27 13:08:16 -04:00
Wojciech Tyczynski 4d117dff6f Fix timeoutSeconds parameter 2015-10-27 15:36:54 +01:00
Jordan Liggitt 3bc4abb9aa Add TypeMeta to discovery response objects 2015-10-27 10:27:13 -04:00
Jerzy Szczepkowski 154923221f Merge pull request #15951 from kargakis/factory-expose-method 
Make CanBeExposed and CanBeAutoscaled composable
 2015-10-27 11:04:40 +01:00
Jerzy Szczepkowski 5ef087adab Merge pull request #16266 from wojtek-t/fix_handshake_reflector 
Reuse TCP connections in Reflector between resync periods.
 2015-10-27 10:36:18 +01:00
Jerzy Szczepkowski bbee6cfcd7 Merge pull request #15461 from kargakis/relax-exposing-multiport-objects 
expose: Enable exposing multiport objects
 2015-10-27 10:25:54 +01:00
Wojciech Tyczynski aa30e38183 Pass resource version to storage List operation. 2015-10-27 10:03:58 +01:00
k8s-merge-robot df265b2d6e Merge pull request #15510 from aveshagarwal/master-selflink-objref 
Auto commit by PR queue bot
 2015-10-27 00:37:21 -07:00
k8s-merge-robot 0ced872a26 Merge pull request #16142 from bprashanth/cloudprovider_methods 
Auto commit by PR queue bot
 2015-10-26 19:44:48 -07:00
Tim St. Clair 17b0a964f4 Always resync after resyncInterval 2015-10-26 18:50:57 -07:00
Janet Kuo cb2466c50f Remove invalid blank line when printing jobs 2015-10-26 17:23:56 -07:00
Daniel Smith fcd99461ff Merge pull request #16286 from liggitt/wsstream_cpu 
Avoid CPU hotloop on client-closed websocket
 2015-10-26 17:19:20 -07:00
Daniel Smith 3cc2ae4da6 Merge pull request #15831 from zhengguoyong/modify_pod_networkplugin_setup_errmsg 
Modify duplicate err msg
 2015-10-26 17:07:18 -07:00