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

26876 Commits (34d4eaea08bbebbf34dac49ad41705852c1aa80f)

Author SHA1 Message Date
goltermann 34d4eaea08 Fixing several (but not all) go vet errors. Most are around string formatting, or unreachable code. 2016-03-22 17:26:50 -07:00
Q-Lee 1f8773ee45 Merge pull request #22893 from Q-Lee/nanny-heapster 
Support addon Deployments, make heapster a deployment with a nanny.
 2016-03-22 14:38:58 -07:00
k8s-merge-robot 9dfbcae449 Merge pull request #22634 from kargakis/kubectl-edit-error-log-fix 
Auto commit by PR queue bot
 2016-03-22 14:37:55 -07:00
Quintin Lee 81ba98ae5d Adding e2e test support for monitoring deployments. 2016-03-22 13:17:06 -07:00
Quintin Lee 0c22277020 Use the same constants as heapster for the heapster nanny. 2016-03-22 13:17:06 -07:00
Quintin Lee c484563315 Removing versions from deployment names. 2016-03-22 13:17:06 -07:00
Quintin Lee 79f0cc25e8 Support addon Deployments, make heapster a deployment with a nanny. 2016-03-22 13:17:06 -07:00
k8s-merge-robot b50e89e323 Merge pull request #23234 from nikhiljindal/swaggerRemoveurlQuery 
Auto commit by PR queue bot
 2016-03-22 11:47:40 -07:00
k8s-merge-robot 8f71655bcc Merge pull request #23325 from MurgaNikolay/master 
Auto commit by PR queue bot
 2016-03-22 11:47:38 -07:00
k8s-merge-robot c262c81a51 Merge pull request #23274 from wojtek-t/speedup_scheduler_spreading 
Auto commit by PR queue bot
 2016-03-22 11:00:48 -07:00
nikhiljindal 532398afb3 Remove url query param that is leading to XSS issue 2016-03-22 10:35:06 -07:00
k8s-merge-robot d124deeb2f Merge pull request #23272 from wojtek-t/conversion_generator_with_framework 
Auto commit by PR queue bot
 2016-03-22 08:42:58 -07:00
k8s-merge-robot e2f4141bb3 Merge pull request #23249 from fejta/hackcmd 
Auto commit by PR queue bot
 2016-03-22 08:07:43 -07:00
k8s-merge-robot 88d50f30d2 Merge pull request #23228 from yifan-gu/rkt_entry_cmd 
Auto commit by PR queue bot
 2016-03-22 08:07:41 -07:00
k8s-merge-robot 566d23e880 Merge pull request #23205 from yifan-gu/append_image_tag 
Auto commit by PR queue bot
 2016-03-22 07:30:52 -07:00
Wojciech Tyczynski ebcc8f737c Parallelize computing selector spreading priority in scheduler. 2016-03-22 14:09:58 +01:00
Marek Grabowski 8a7d8c4f9d Merge pull request #23042 from gmarek/testing 
Change scalability test configs
 2016-03-22 14:08:58 +01:00
k8s-merge-robot 490ab398e5 Merge pull request #23324 from bryk/changelog-fix 
Auto commit by PR queue bot
 2016-03-22 05:40:18 -07:00
k8s-merge-robot 772069feca Merge pull request #23176 from pmorie/unique-volume-mount 
Auto commit by PR queue bot
 2016-03-22 05:40:17 -07:00
gmarek aa09cb097b Change scalability test configs 2016-03-22 13:39:16 +01:00
k8s-merge-robot a1cd7311f7 Merge pull request #23123 from rata/master 
Auto commit by PR queue bot
 2016-03-22 05:03:02 -07:00
k8s-merge-robot d37baf748f Merge pull request #22933 from liangchenye/imageConform 
Auto commit by PR queue bot
 2016-03-22 04:27:50 -07:00
Nikolay Murga 70b918a2c0 Fix hairpin mode 2016-03-22 13:00:18 +02:00
bryk 138d03b8b3 Fix changelog for Dashboard UI part 
It had a typo and an unfinished sentence. Also, I've changes meaning to
be explicit about the note.

Fixes #23277
 2016-03-22 11:59:02 +01:00
k8s-merge-robot 76acfd4b7d Merge pull request #22916 from liggitt/namespace-subresources 
Auto commit by PR queue bot
 2016-03-22 01:25:58 -07:00
k8s-merge-robot 7e8a89853c Merge pull request #21624 from smarterclayton/debug 
Auto commit by PR queue bot
 2016-03-22 00:48:15 -07:00
Wojciech Tyczynski f1248b9c82 Migrate to new conversion generator 2016-03-22 08:43:02 +01:00
k8s-merge-robot a690c2ca76 Merge pull request #22914 from liggitt/test_export 
Auto commit by PR queue bot
 2016-03-21 23:06:46 -07:00
k8s-merge-robot d221649429 Merge pull request #22845 from ZhangZhenhua/eliminate-roles-ambiguity 
Auto commit by PR queue bot
 2016-03-21 21:30:15 -07:00
Clayton Coleman 0a274a85d1 Allow logs to be used with a preloaded pod. 2016-03-21 23:59:59 -04:00
Clayton Coleman 3a29e3971b Improve terminal reuse and attach 
Currently attach and the editor do not share the same logic for saving
and restoring the terminal, and are not suitable for nesting (when the
caller wants to create something, attach, and then delete something when
the attach is over).  This commit moves the interrupt protection logic
to a util package and supports nesting interrupt handlers.
 2016-03-21 23:59:58 -04:00
k8s-merge-robot 4d98abf26c Merge pull request #23313 from zmerlynn/container-vm-v20160321 
Auto commit by PR queue bot
 2016-03-21 20:55:33 -07:00
k8s-merge-robot 562516b60e Merge pull request #22838 from resouer/util-pkg 
Auto commit by PR queue bot
 2016-03-21 19:21:33 -07:00
k8s-merge-robot 8c02a46c4d Merge pull request #22486 from thockin/update-gcfg-dep 
Auto commit by PR queue bot
 2016-03-21 18:47:21 -07:00
k8s-merge-robot 6147ef87d8 Merge pull request #22263 from runseb/22121 
Auto commit by PR queue bot
 2016-03-21 18:06:37 -07:00
Zach Loafman b2cf4b8c11 Bump to container-vm-v20160321 2016-03-21 17:42:34 -07:00
k8s-merge-robot 6f2729f0dc Merge pull request #23132 from jeffmendoza/update-exmaple-guidelines 
Auto commit by PR queue bot
 2016-03-21 17:30:24 -07:00
k8s-merge-robot f2d14990a5 Merge pull request #23180 from roberthbailey/dead-code 
Auto commit by PR queue bot
 2016-03-21 17:30:22 -07:00
k8s-merge-robot 0a28a38110 Merge pull request #22280 from justinsb/fix_error_message_formats 
Auto commit by PR queue bot
 2016-03-21 16:53:38 -07:00
Joe Finney e4a1edd52e Merge pull request #23286 from wonderfly/update_trusty_release_jobs 
Move e2e test jobs for Trusty dev to 1.2
 2016-03-21 16:17:34 -07:00
k8s-merge-robot edc35bfeba Merge pull request #23160 from janetkuo/rollback-copy-annotation 
Auto commit by PR queue bot
 2016-03-21 15:38:19 -07:00
k8s-merge-robot 2906d25204 Merge pull request #23080 from nikhiljindal/apiRefDoc 
Auto commit by PR queue bot
 2016-03-21 14:58:03 -07:00
Jordan Liggitt 1d4c56c2f6 Move TestRuntimeCache into non-test file 2016-03-21 16:21:55 -04:00
k8s-merge-robot 4b1b291a9f Merge pull request #22905 from gambol99/cephfs_path_example 
Auto commit by PR queue bot
 2016-03-21 12:46:26 -07:00
Rodrigo Campos c0af96ccc2 Make "--insecure-skip-tls-verify" work on all cases 
In the getting started example of AWS, the master uses an IP that is changed on
stop/start. If you are playing with a cluster and stop and start the master,
the IP is changed and you can't connect again, even using the
"--insecure-skip-tls-verify" option.

This patch fixes it and makes the option work on those cases too by making
sure no CA/CAData is added when it shouldn't.
 2016-03-21 16:31:31 -03:00
k8s-merge-robot 63608235d6 Merge pull request #22153 from idvoretskyi/patch-8 
Auto commit by PR queue bot
 2016-03-21 12:11:12 -07:00
Daniel Wang f5460a4bd2 Move e2e test jobs for Trusty dev to 1.2 
After this change, jobs that use Trusty dev images will test against the
`release-1.2` branch, and use Trusty images for both the master and the nodes.
Trusty beta and stable jobs are kept in the `release-1.1` branch, and only use
Trusty images on nodes.
 2016-03-21 10:35:27 -07:00
Janet Kuo 482efba8de Copy annotations back from RS to Deployment on rollback 2016-03-21 10:21:48 -07:00
k8s-merge-robot 2bb6f74bf9 Merge pull request #23099 from shawnps/patch-12 
Auto commit by PR queue bot
 2016-03-21 09:19:21 -07:00
k8s-merge-robot 5c90a1d212 Merge pull request #23219 from david-mcmahon/cherry-picks 
Auto commit by PR queue bot
 2016-03-21 09:19:19 -07:00