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

2431 Commits (a55b4f2e77e611e8e585fc588a05cc8dfa86d973)

Author SHA1 Message Date
k8s-merge-robot e84fee2189 Merge pull request #22172 from gmarek/register 
Auto commit by PR queue bot
 2016-03-07 02:07:43 -08:00
k8s-merge-robot 61c9a004a5 Merge pull request #22397 from bprashanth/dns_debug 
Auto commit by PR queue bot
 2016-03-07 00:20:03 -08:00
Prashanth Balasubramanian 10cf2d4e4e Ingress https E2E 2016-03-06 17:21:15 -08:00
Brian Grant 83f2f14dcc Merge pull request #22617 from bprashanth/gc 
Poll for gc'd pods.
 2016-03-06 16:24:44 -08:00
Prashanth Balasubramanian 543a0691f6 Poll for gc'd pods. 2016-03-06 15:52:30 -08:00
k8s-merge-robot 95ab1936ea Merge pull request #22559 from krousey/discbreak 
Auto commit by PR queue bot
 2016-03-06 12:47:07 -08:00
jay vyas ec4db43197 Decouple webserver from storage tests 2016-03-06 14:53:52 -05:00
k8s-merge-robot 8ab8231c20 Merge pull request #22577 from jpiccari/master 
Auto commit by PR queue bot
 2016-03-06 00:18:53 -08:00
k8s-merge-robot 168711b3cd Merge pull request #22281 from wojtek-t/increase_qps_limits 
Auto commit by PR queue bot
 2016-03-05 21:27:57 -08:00
k8s-merge-robot 2472a176b7 Merge pull request #22275 from gmarek/flake 
Auto commit by PR queue bot
 2016-03-05 17:54:29 -08:00
Erick Fejta 51174e6830 Use versioned images in deployment.go to avoid unnecessary gcr.io pulling 2016-03-05 17:40:59 -08:00
k8s-merge-robot 2e03822386 Merge pull request #21335 from deads2k/make-rc-logs-work 
Auto commit by PR queue bot
 2016-03-05 09:37:24 -08:00
Maru Newby d405718a83 Move net e2e helpers to util.go for reuse 
Some of the helper methods used by test/e2e/networking.go are useful for
downstream e2e tests (e.g. openshift).
 2016-03-05 17:09:24 +00:00
k8s-merge-robot 4091d51750 Merge pull request #22380 from jayunit100/conformance-rw 
Auto commit by PR queue bot
 2016-03-05 07:23:06 -08:00
k8s-merge-robot 6d9e0ed038 Merge pull request #22312 from janetkuo/improve-error-log 
Auto commit by PR queue bot
 2016-03-05 04:11:06 -08:00
k8s-merge-robot 5efa8aa7d1 Merge pull request #22404 from yujuhong/dump_mem 
Auto commit by PR queue bot
 2016-03-05 00:38:56 -08:00
k8s-merge-robot e9d3be83ae Merge pull request #22241 from Random-Liu/recover-back-off-behaviour 
Auto commit by PR queue bot
 2016-03-05 00:05:15 -08:00
k8s-merge-robot ef129499da Merge pull request #22459 from jayunit100/disruptivediskannot 
Auto commit by PR queue bot
 2016-03-04 21:17:52 -08:00
k8s-merge-robot ea43db8039 Merge pull request #22481 from ihmccreery/better-upgrade-tests 
Auto commit by PR queue bot
 2016-03-04 20:07:29 -08:00
k8s-merge-robot 28b3448a9a Merge pull request #22314 from yujuhong/resource_100 
Auto commit by PR queue bot
 2016-03-04 18:48:02 -08:00
Joshua Piccari f5f83b076a Improve go report card by fixing typos in comments 2016-03-04 18:30:59 -08:00
Isaac Hollander McCreery 0e9114f667 Add ExperimentalNodeUpgrade test that a service stays up during cluster upgrade, not just master upgrade 
- Duplicate old test to keep old functionality while allowing ExperimentalNodeUpgrade
- Also remove push test; no longer used/functioning
 2016-03-04 16:10:29 -08:00
Kris dbde4fd798 Move the discovery client to its own package 2016-03-04 13:44:52 -08:00
Abhishek Shah a3c00aadd5 Specify hostname, subdomain via annotation on podspec. 
The hostname is a DNS A record, if the subdomain maps to a service name
in the same namespace
 2016-03-04 13:28:33 -08:00
Marcin Wielgus a13843cddb Add volumes, volumemounts and host ports to rcconfig in e2e utils 2016-03-04 18:38:10 +01:00
Abhi Shah b25a48d605 Revert "Move discovery client to its own package" 2016-03-04 09:24:54 -08:00
Abhi Shah 627edd2588 Merge pull request #22016 from krousey/discbreak 
Move discovery client to its own package
 2016-03-04 09:17:46 -08:00
k8s-merge-robot 2a8ec62e76 Merge pull request #22522 from mwielgus/cm_utils 
Auto commit by PR queue bot
 2016-03-04 08:01:54 -08:00
k8s-merge-robot 917fb4264d Merge pull request #22461 from jayunit100/skipNodeDiskFill 
Auto commit by PR queue bot
 2016-03-04 08:01:53 -08:00
Marcin Wielgus 0a7e344d49 CustomMetric support in autoscaling utils 2016-03-04 15:50:55 +01:00
k8s-merge-robot 6a6fcc8c2b Merge pull request #22432 from piosz/hpa-e2e 
Auto commit by PR queue bot
 2016-03-04 03:45:33 -08:00
k8s-merge-robot b45bf88105 Merge pull request #22513 from gmarek/density 
Auto commit by PR queue bot
 2016-03-04 03:12:52 -08:00
k8s-merge-robot 0e3469dce3 Merge pull request #22183 from pmorie/config-quota 
Auto commit by PR queue bot
 2016-03-04 03:12:51 -08:00
k8s-merge-robot 1b9abdc920 Merge pull request #22510 from gmarek/proxy 
Auto commit by PR queue bot
 2016-03-04 02:29:37 -08:00
Piotr Szczesniak 60430ca1fb Added HPA lightweight e2e test 2016-03-04 11:23:07 +01:00
gmarek 43a8f04193 Add a comment explaining the necessary scale for Density test 2016-03-04 11:05:20 +01:00
k8s-merge-robot 17b5ac4808 Merge pull request #22440 from gmarek/more_flake 
Auto commit by PR queue bot
 2016-03-04 01:28:34 -08:00
gmarek 633d2cdfc1 Add a workaround for hanging proxy in nodeProxyRequest 2016-03-04 10:27:41 +01:00
gmarek 7f3c490519 Print running pods before SchedulerPredicates tests 2016-03-04 09:50:33 +01:00
gmarek 030f5d073d Relax thresholds for cluster saturation time 2016-03-04 09:07:52 +01:00
k8s-merge-robot 258eac505f Merge pull request #21400 from derekwaynecarr/namespace_deletion_discovery 
Auto commit by PR queue bot
 2016-03-03 21:33:01 -08:00
Jeff Lowdermilk f8d7793609 Merge pull request #22203 from bprashanth/network_flake 
Ignore network flake in services e2e.
 2016-03-03 15:20:12 -08:00
Jay Vyas 097e3ea3d4 Skip node disk test if cluster size < 2 2016-03-03 16:00:17 -05:00
Jay Vyas b3203fb111 annotate NodeOutOfDisk as disruptive 2016-03-03 15:36:53 -05:00
Janet Kuo 87a240f828 Improve deployment error logs 2016-03-03 11:44:04 -08:00
Jeff Lowdermilk 8c500a9c31 Merge pull request #22279 from soltysh/describer_none 
Unifying empty/none/not set values in describer
 2016-03-03 11:40:54 -08:00
Prashanth Balasubramanian 92ff05f2e6 Wait till netexec is Ready in kubeproxy e2e 2016-03-03 11:27:32 -08:00
Prashanth Balasubramanian 33bb8e863c Add a simple clusterapi-tester, improve e2e logging. 2016-03-03 10:01:01 -08:00
deads2k f8f45df578 make kubectl logs work for replication controllers 2016-03-03 11:17:50 -05:00
gmarek 496fc3c7ed Make scheduler predicates test work with registered master 2016-03-03 10:09:26 +01:00
Wojciech Tyczynski 2ba342797d Explicitly set request for latency pods 2016-03-03 08:29:47 +01:00
derekwaynecarr 773cf73f0e Add e2e tests to verify more resources are deleted 2016-03-02 23:34:45 -05:00
Yu-Ju Hong 52d75d2188 e2e: print runtime MemStats when memory usage exceeds expectation 2016-03-02 17:20:49 -08:00
Yu-Ju Hong 216727c448 e2e: add kubelet resource usage test to monitor 100 pods per node 2016-03-02 15:23:54 -08:00
Jay Vyas 09ad2da7ac minimal hostPath fix 2016-03-02 17:22:45 -05:00
Paul Morie 834776aa1f Add resource quota for ConfigMap 2016-03-02 09:59:51 -05:00
Paul Morie d87e712b05 Disambiguate emptydir wrapper test 2016-03-02 09:00:16 -05:00
Maciej Szulik 1b56d79f64 Unifying empty/none/not set values in describer 2016-03-02 13:57:39 +01:00
Wojciech Tyczynski e9d99bd8e7 Revert "Speed up load test in smaller clusters" 2016-03-02 12:24:13 +01:00
Janet Kuo 7bcb7289bb Don't pull from docker hub in deployment e2e test 2016-03-01 18:41:40 -08:00
Random-Liu a88dad1c3e Backoff restart container with liveness probing failure 2016-03-01 17:36:12 -08:00
k8s-merge-robot 8060e9c5eb Merge pull request #22200 from pwittrock/flaky 
Auto commit by PR queue bot
 2016-03-01 14:51:59 -08:00
k8s-merge-robot 25ac08c0ab Merge pull request #22278 from gmarek/more_flake 
Auto commit by PR queue bot
 2016-03-01 10:13:45 -08:00
k8s-merge-robot 94a2319804 Merge pull request #22211 from derekwaynecarr/quota_fix 
Auto commit by PR queue bot
 2016-03-01 10:13:44 -08:00
Wojciech Tyczynski c47aa368bd Increase QPS limits in integration and e2e tests 2016-03-01 16:49:38 +01:00
gmarek 675f45e9b4 Wait for namespace deletion in SchedulerPredicates 2016-03-01 16:40:28 +01:00
k8s-merge-robot 9e5d1b61fa Merge pull request #21882 from gmarek/throttle 
Auto commit by PR queue bot
 2016-03-01 06:38:06 -08:00
k8s-merge-robot a40f8fb4d8 Merge pull request #21827 from spxtr/upgrade-subgroup 
Auto commit by PR queue bot
 2016-03-01 05:29:47 -08:00
k8s-merge-robot 84a98673cd Merge pull request #21785 from yujuhong/rss_limit 
Auto commit by PR queue bot
 2016-03-01 04:57:09 -08:00
k8s-merge-robot 95a9dd041e Merge pull request #22269 from wojtek-t/faster_load_test 
Auto commit by PR queue bot
 2016-03-01 04:25:27 -08:00
k8s-merge-robot 4057803e96 Merge pull request #22265 from wojtek-t/set_request_in_density 
Auto commit by PR queue bot
 2016-03-01 04:25:26 -08:00
k8s-merge-robot 8b1516cb07 Merge pull request #22055 from gmarek/saturation 
Auto commit by PR queue bot
 2016-03-01 04:25:24 -08:00
Wojciech Tyczynski 4a7af87984 Set requests in scalability tests 2016-03-01 12:15:23 +01:00
Wojciech Tyczynski c6c98513eb Speed up load test in smaller clusters 2016-03-01 12:05:05 +01:00
Wojciech Tyczynski 2e9e92a4b3 Increase cpu limit for Kibana in scalability tests 2016-03-01 11:58:59 +01:00
gmarek c9abcfa512 Add a cluster saturation time check to the Density test 2016-03-01 09:31:36 +01:00
Janet Kuo 47cf2f5a7c Deployment e2e tests to wait for async actions to happen rather than check it immediately 2016-03-01 00:14:20 -08:00
k8s-merge-robot dfc8635da7 Merge pull request #21443 from yujuhong/density 
Auto commit by PR queue bot
 2016-03-01 00:08:49 -08:00
k8s-merge-robot 5b415a7aed Merge pull request #22210 from janetkuo/deployment-e2e 
Auto commit by PR queue bot
 2016-02-29 22:44:40 -08:00
k8s-merge-robot 9a4171c9de Merge pull request #22202 from janetkuo/fix-rollback-flake 
Auto commit by PR queue bot
 2016-02-29 22:12:29 -08:00
derekwaynecarr cb1f1d373e ResourceQuota e2e should not assume 1 secret by default 2016-02-29 20:48:48 -05:00
derekwaynecarr c9e4c846e6 Incorrect type passed into quota reflector 2016-02-29 20:48:48 -05:00
Prashanth Balasubramanian 41cbf952ca Ignore network flake in services e2e. 2016-02-29 17:40:24 -08:00
Janet Kuo 50d43ef65c In deployment rollback e2e test, wait for async actions to happen 2016-02-29 16:35:00 -08:00
Janet Kuo 1994b26b8d Uniquify names of controllers in deployment e2e tests 2016-02-29 16:09:14 -08:00
Kris f22664159e Move the discovery client to its own package 2016-02-29 15:37:21 -08:00
Matt Liggett b53144ec70 Mark Daemon Set as Serial since it won't work in parallel. 
Fixes #21767
 2016-02-29 14:45:04 -08:00
Yu-Ju Hong bd2323d5a6 e2e: add a high node density test 
This test is primarily inteded to test the node performance.
 2016-02-29 14:38:57 -08:00
Janet Kuo c65d7b082c Move verifyPods to e2e test util 2016-02-29 14:26:01 -08:00
Saad Ali 83d74dd952 Merge pull request #22201 from liggitt/token-e2e 
Use serviceAccountProvisionTimeout for e2e tests
 2016-02-29 14:19:29 -08:00
Jordan Liggitt daa37e121e Use serviceAccountProvisionTimeout for e2e tests 2016-02-29 16:00:38 -05:00
Phillip Wittrock 1b9a3fd5f8 Log container logs for failed containers if failedCount > max 2016-02-29 12:19:00 -08:00
Kris e664ef922f Move restclient to its own package 2016-02-29 12:05:13 -08:00
k8s-merge-robot ce2556decf Merge pull request #22169 from wojtek-t/more_readable_load_log 
Auto commit by PR queue bot
 2016-02-29 05:09:39 -08:00
gmarek ba8a67e554 DeamonSet test expect daemons on unschedulable Nodes 2016-02-29 12:17:18 +01:00
Wojciech Tyczynski a126a0b53d Extend errors in load test 2016-02-29 11:17:27 +01:00
gmarek d9fe5283c3 Log distribution of containers in density test 2016-02-29 11:14:27 +01:00
gmarek 110340c467 Add an option to pass client's QPS/burst to e2e framework 2016-02-29 09:32:29 +01:00
k8s-merge-robot 5ecbf4ff4a Merge pull request #22138 from bgrant0607/bugfix1 
Auto commit by PR queue bot
 2016-02-28 02:00:40 -08:00
Brian Grant d0dd4f8a93 Restore expectation timeout to 5 minutes. Fix enqueueDeployment. Pass by reference. 
Make names of ReplicaSets created by Deployment deterministic for idempotence.
Eliminate use of expectations in Deployment controller.
 2016-02-28 07:33:07 +00:00
k8s-merge-robot 6f8a951f87 Merge pull request #20446 from derekwaynecarr/quota_scopes 
Auto commit by PR queue bot
 2016-02-27 19:46:42 -08:00
Brian Grant 2c9e2745b6 Merge pull request #22084 from jayunit100/e2epanicreplica 
Prevent panic in replica_set e2e
 2016-02-27 05:12:49 -08:00
Brian Grant 10e9bca7fb Merge pull request #21929 from janetkuo/remove-rollback-from-flaky 
Remove all deployment e2e tests from flaky list
 2016-02-26 23:23:13 -08:00
Fabio Yeon 440c3ff31b Merge pull request #22095 from goltermann/downward 
Fixes to Downward and Secrets E2E examples
 2016-02-26 19:07:04 -08:00
k8s-merge-robot e0b305c6be Merge pull request #21609 from fejta/pull-version 
Auto commit by PR queue bot
 2016-02-26 18:00:33 -08:00
jay vyas 47c439de06 Prevent panic on podCreated failure by catching error 2016-02-26 20:46:15 -05:00
derekwaynecarr 75db4cb19a Add e2e tests for ResourceQuota 2016-02-26 20:34:15 -05:00
k8s-merge-robot 420d98fd8b Merge pull request #22027 from bprashanth/services_compare 
Auto commit by PR queue bot
 2016-02-26 17:25:22 -08:00
goltermann 9c701a47e2 Fixes to Downward and Secrets E2E examples. 2016-02-26 16:35:21 -08:00
Janet Kuo 34a97a2433 Remove all deployment e2e tests from flaky list 2016-02-26 15:54:52 -08:00
Fabio Yeon 09dd0f1809 Merge pull request #21639 from jayunit100/cassandra-example-fix 
Fix broken cassandra test: Up to date containers + RC of 2 nodes with…
 2016-02-26 15:48:02 -08:00
Fabio Yeon 1065f4f932 Merge pull request #21621 from jayunit100/k8bps-defaultns 
[examples] k8petstore: connection timeouts + allow blips.
 2016-02-26 15:47:00 -08:00
nikhiljindal 1eaf760c95 deployment e2e: print out the error 2016-02-26 14:18:56 -08:00
Fabio Yeon 3ce28f5e0c Merge pull request #22014 from ihmccreery/decouple-node-upgrade 
Decouple node upgrade from master upgrade
 2016-02-26 13:03:18 -08:00
Fabio Yeon bdfbdc72d9 Merge pull request #22057 from gmarek/register 
Small fix to make tests pass when master node is registered
 2016-02-26 13:00:27 -08:00
k8s-merge-robot 192119c2ac Merge pull request #21610 from fejta/e2etag 
Auto commit by PR queue bot
 2016-02-26 12:52:43 -08:00
Prashanth Balasubramanian 9be53e6319 Strip whitespace when comparing endpoints in services test. 2016-02-26 12:02:14 -08:00
Fabio Yeon 3dab166da4 Merge pull request #21776 from erictune/job-sel-gen 
Selector generation for batch/v1 Job
 2016-02-26 11:58:21 -08:00
k8s-merge-robot 649b6879d7 Merge pull request #22053 from gmarek/resources 
Auto commit by PR queue bot
 2016-02-26 08:03:55 -08:00
gmarek 48fefd0f53 Small fix to make tests pass when master node is registered 2016-02-26 16:09:49 +01:00
gmarek 94c08fbf31 Workaround hanging proxies in resource gatherer 2016-02-26 14:23:53 +01:00
Wojciech Tyczynski f3b44c129a Increase memory limit for influxdb in Density test 2016-02-26 13:49:05 +01:00
gmarek d859968377 Remove debug logs from resource gatherer 2016-02-26 10:23:08 +01:00
Marek Grabowski 1cc91025b7 Merge pull request #22021 from bprashanth/log_addons 
Dump kubectl logs for non-ready containers on startup
 2016-02-26 09:21:01 +01:00
k8s-merge-robot b092294302 Merge pull request #21807 from freehan/nettest 
Auto commit by PR queue bot
 2016-02-25 20:10:48 -08:00
k8s-merge-robot 7ee8dde1e3 Merge pull request #21945 from yujuhong/tag_nginx 
Auto commit by PR queue bot
 2016-02-25 19:37:09 -08:00
k8s-merge-robot 8c60068b36 Merge pull request #21794 from caesarxuchao/fix-19715 
Auto commit by PR queue bot
 2016-02-25 18:31:52 -08:00
Fabio Yeon 307ec46bce Merge pull request #21474 from quinton-hoole/2016-01-12-ubelite-e2e-spreading 
Add Ubernetes Lite e2e tests for spreading RC and Service pods evenly…
 2016-02-25 17:33:00 -08:00
nikhiljindal 2db2fba1b1 Delete replica set and its pods as well rather than just deleting the replica set 2016-02-25 15:26:58 -08:00
Prashanth Balasubramanian d5226bb044 Kubectl log all failed containers in namespace=kube-system. 2016-02-25 14:54:17 -08:00
Isaac Hollander McCreery de3b17a86f Remove silent provider skips, since upgrade tests are feature tests, and aren't turned on by default anyway 2016-02-25 13:40:22 -08:00
Isaac Hollander McCreery 1bf69415cd Decouple node upgrade from master upgrade 2016-02-25 13:37:16 -08:00
Sami Wagiaalla d43372b901 Add SELinuxOptions to emptyDir e2e 
This enables the tests to use the kubelet's SELinux labeling.
Otherwise SELinux will prevent access and the tests fail.
 2016-02-25 16:26:16 -05:00
Eric Tune 875755f992 Added Selector Generation to Job. 
Added selector generation to Job's
strategy.Validate, right before validation.
Can't do in defaulting since UID is not known.

Added a validation to Job to ensure that the generated
labels and selector are correct when generation was requested.
This happens right after generation, but validation is in a better
place to return an error.

Adds "manualSelector" field to batch/v1 Job to control selector generation.
Adds same field to extensions/__internal.  Conversion between those two
is automatic.

Adds "autoSelector" field to extensions/v1beta1 Job.  Used for storing batch/v1 Jobs
    - Default for v1 is to do generation.
    - Default for v1beta1 is to not do it.
    - In both cases, unset == false == do the default thing.

Release notes:
Added batch/v1 group, which contains just Job, and which is the next
version of extensions/v1beta1 Job.

The changes from the previous version are:
- Users no longer need to ensure labels on their pod template are unique to the enclosing
  job (but may add labels as needed for categorization).
- In v1beta1, job.spec.selector was defaulted from pod labels, with the user responsible for uniqueness.
  In v1, a unique label is generated and added to the pod template, and used as the selector (other
  labels added by user stay on pod template, but need not be used by selector).
- a new field called "manualSelector" field exists to control whether the new behavior is used,
  versus a more error-prone but more flexible "manual" (not generated) seletor.  Most users
  will not need to use this field and should leave it unset.

Users who are creating extensions.Job go objects and then posting them using the go client
will see a change in the default behavior.  They need to either stop providing a selector (relying on
selector generation) or else specify "spec.manualSelector" until they are ready to do the former.
 2016-02-25 09:28:07 -08:00
gmarek fdb3020f85 Add more logs to resource gatherer to help with debugging 2016-02-25 14:55:29 +01:00
k8s-merge-robot 995b72798c Merge pull request #21974 from gmarek/refactor-gatherer 
Auto commit by PR queue bot
 2016-02-25 04:10:32 -08:00
k8s-merge-robot 47986aa018 Merge pull request #21163 from pmorie/downward-api-e2e-time 
Auto commit by PR queue bot
 2016-02-25 03:08:44 -08:00
gmarek ff6b3d1fb1 Fix spreading in resource usage gatherer 2016-02-25 11:54:34 +01:00
k8s-merge-robot bc52f12a56 Merge pull request #20808 from soltysh/e2e_tests 
Auto commit by PR queue bot
 2016-02-25 01:57:24 -08:00
Minhan Xia 66940c2d44 wait for all webserver endpoints to come up before contacting peers 2016-02-24 18:35:59 -08:00
Quinton Hoole a9fd207140 Add Ubernetes Lite e2e tests for spreading RC and Service pods evenly across all zones. 
Fixes #19415
 2016-02-24 16:59:41 -08:00
Yu-Ju Hong a66a60bc37 e2e: change the tests to use versioned image nginx:1.7.9 2016-02-24 16:54:40 -08:00
Janet Kuo 082702390a Fix test flake 2016-02-24 16:41:36 -08:00
Alex Robinson c031697848 Merge pull request #21626 from jayunit100/examples-spark-fix 
Fix broken spark tests to use yaml files, 1 worker, declare DNS depe…
 2016-02-24 16:30:19 -08:00
Chao Xu 3efd3c62e6 Replace ineffective DeleteOptions with nil 2016-02-24 15:06:24 -08:00
Alex Robinson 0b4d702e04 Merge pull request #21730 from lavalamp/fix-proxy-svc-pod 
add readiness probe to proxy test
 2016-02-24 14:44:48 -08:00
Alex Robinson 475076e1df Merge pull request #21569 from lavalamp/fix-shadowing 
fix shadowing bug
 2016-02-24 14:42:58 -08:00
Brian Grant 0b5edab208 Merge pull request #21857 from nikhiljindal/stopDeployment 
fix deployment e2e flake: Update DeploymentReaper.Stop to use ObservedGeneration
 2016-02-24 14:26:23 -08:00
k8s-merge-robot 07e9bd82dc Merge pull request #21759 from gmarek/refactor-gatherer 
Auto commit by PR queue bot
 2016-02-24 04:37:14 -08:00
gmarek ac706ea1de Resource gatherer refactoring 2016-02-24 12:55:32 +01:00