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

15649 Commits (159ba489329e9f6ce422541e13f97e1166090ec8)

Author SHA1 Message Date
Alex Mohr 159ba48932 Merge pull request #12238 from eparis/godeps 
Auto commit by PR queue bot
 2015-08-05 01:06:11 -07:00
Alex Mohr f75252a6b1 Merge pull request #12130 from mesosphere/validate-cluster 
Auto commit by PR queue bot
 2015-08-05 00:46:00 -07:00
Alex Mohr 75bf16f259 Merge pull request #9594 from manansaraf/name_error_issue 
Auto commit by PR queue bot
 2015-08-05 00:24:42 -07:00
Alex Mohr e4fde6d2ca Merge pull request #9583 from eparis/make-cert-path 
generate-cert: allow for alternative paths
 2015-08-05 00:04:17 -07:00
Alex Mohr 9610b8fe05 Merge pull request #12247 from brendandburns/queue 
Fix submit queue when there are multiple LGTMs
 2015-08-04 23:46:51 -07:00
Alex Mohr d76e7f818f Merge pull request #12251 from alex-mohr/scheduler 
Fix e2e scheduler_predicates.go to have 10 minute timeout
 2015-08-04 23:40:59 -07:00
Alex Mohr bcb6e1e107 Fix e2e scheduler_predicates.go to have 10 minute timeout instead of 2 
minutes.

On an n1-standard-1 with only this test running, 2 minutes was enough
to create 189 pods out of the 300 desired.  On slower VMs or with more
activity on the master (such as with parallel tests), 2 minutes is
nowhere near enough.  This is a functional test, not a performance
test.
 2015-08-04 22:59:30 -07:00
Alex Mohr c29c8414e1 Merge pull request #8607 from liggitt/serviceaccount_groups 
Add groups to service account user.Info
 2015-08-04 22:22:18 -07:00
Alex Mohr 6a6d58f57f Merge pull request #11972 from jacobtomlinson/typos 
Fixed typo
 2015-08-04 22:21:08 -07:00
Brendan Burns c5643c3c03 Fix submit queue when there are multiple LGTMs 2015-08-04 21:52:21 -07:00
Alex Robinson 714b39f025 Merge pull request #12240 from a-robinson/logs 
Also collect the monit and salt logs in our fluentd configs
 2015-08-04 19:56:14 -07:00
Alex Mohr aaaadfcab6 Merge pull request #12229 from GoogleCloudPlatform/clarify_contribution 
Auto commit by PR queue bot
 2015-08-04 19:29:16 -07:00
Alex Mohr cab88c6885 Merge pull request #12215 from runningwild/master 
Auto commit by PR queue bot
 2015-08-04 19:08:44 -07:00
Alex Mohr e92c63be74 Merge pull request #12172 from GoogleCloudPlatform/revert-12106-demote 
Auto commit by PR queue bot
 2015-08-04 18:48:49 -07:00
Alex Mohr 0e8020f9bb Merge pull request #11779 from JanetKuo/add-kubectl-annotation 
Auto commit by PR queue bot
 2015-08-04 18:28:12 -07:00
Alex Mohr 1b6089a783 Merge pull request #11196 from yujuhong/resource_monitor 
Auto commit by PR queue bot
 2015-08-04 18:06:18 -07:00
Alex Mohr e528d2d948 Merge pull request #12198 from mesosphere/default-mem-and-cpu-limit 
MESOS: Set the cpu+mem default limit in the SchedulerServer
 2015-08-04 17:42:51 -07:00
Alex Mohr 927268e619 Merge pull request #12234 from eparis/run-gofmt-on-15 
Support golang 1.5 in verify-gofmt
 2015-08-04 17:34:36 -07:00
Alex Mohr af76271e7c Merge pull request #12213 from caseydavenport/cd4-kube-calico-bare-metal 
CoreOS + Calico bare-metal guide
 2015-08-04 17:31:35 -07:00
Alex Robinson cc02e50fc7 Collect more of the VM's log files (monit, salt) in fluentd-es. 2015-08-05 00:22:38 +00:00
Alex Robinson 7430181d65 Collect more of the VM's log files (monit, salt) in fluentd-gcp. 2015-08-05 00:21:47 +00:00
Eric Paris a29789d60e Switch from to code.google.com/p/go-uuid/uuid to github.com/pborman/uuid 2015-08-04 20:13:07 -04:00
Eric Paris 12d2638637 Update mesos-go godep (to eliminate its use of code.google.com) 
This helps us remove one more (dying) Godep import.
 2015-08-04 20:11:59 -04:00
Eric Paris b4fb24f4bd Move from code.google.com to google.golang.org for google-api-go-client 2015-08-04 20:08:55 -04:00
Alex Mohr 879bf62e27 Merge pull request #12086 from bdevloed/patch-1 
Update docker.md, simplified kill command
 2015-08-04 17:08:10 -07:00
Alex Mohr 8d31a576a0 Merge pull request #12076 from socaa/skeleton 
Auto commit by PR queue bot
 2015-08-04 16:59:34 -07:00
Eric Paris 08d8bea61d Support 1.5 in verify-gofmt 2015-08-04 19:59:19 -04:00
Eric Paris 0753acf2f8 Allow make-ca-cert.sh to run on OS X 
Currently make-ca-cert.sh uses (equiv of)

mktemp -d --tmpdir kube.XXXXX

but --tmpdir is not a valid option on OS X. Switch to

mktemp -d -t kube.XXXXX

Which is valid, but subtly different between OS X and Linux. The
directory you get back will be different on each.

Linux:  ${tmpdir}/kube.y5Bsu/
OS X:   ${tmpdir}/kube.XXXXX.VQ81oOui/
 2015-08-04 19:03:01 -04:00
Eric Paris c69b6f5ba7 Respect KUBECTL_BIN in kube-addon-update.sh not just kube-addons.sh 2015-08-04 19:02:31 -04:00
Eric Paris 6b9ef5b2d8 generate-cert: allow for alternative paths 
Instead of hard coding kube-cert and /srv/kubernetes allow these to be
overwritten by environment variables.  / is immutable on some systems
and so /srv is not a possible location to store data.
 2015-08-04 19:01:16 -04:00
Alex Mohr 3342b781b4 Merge pull request #12158 from eparis/godeps 
Auto commit by PR queue bot
 2015-08-04 15:57:42 -07:00
Alex Mohr e17aafa7dd Merge pull request #11679 from bprashanth/haproxy 
Auto commit by PR queue bot
 2015-08-04 15:35:44 -07:00
Zach Loafman 6ffb0e8e5f Clarify that contributions need to be from CLA-signers. 2015-08-04 15:11:16 -07:00
Alex Mohr 2d81775a2d Merge pull request #11151 from gmarek/max_pods_e2e 
Auto commit by PR queue bot
 2015-08-04 15:11:13 -07:00
Alex Mohr b90663924b Merge pull request #12146 from deads2k/tweak-testclient 
make testclient more precise
 2015-08-04 14:49:11 -07:00
Manan Saraf b2ebfeef25 Fixed empty name error and also changed tests 2015-08-04 14:09:42 -07:00
Alex Mohr 366b382901 Merge pull request #10200 from caesarxuchao/resthandler-validate-version 
verify and default APIVersion in createHandler, verify APIVersion in UpdateResource
 2015-08-04 13:09:31 -07:00
Dr. Stefan Schimanski 191f2def5f Add test to check that NewSchedulerServer sets resource defaults 2015-08-04 22:01:23 +02:00
Alex Mohr ad4086eab1 Merge pull request #11308 from gmarek/pillar 
Auto commit by PR queue bot
 2015-08-04 12:42:57 -07:00
Alex Mohr 3ed0e077ac Merge pull request #12049 from brendandburns/docs 
Auto commit by PR queue bot
 2015-08-04 11:58:23 -07:00
Alex Mohr 1311b9dce1 Merge pull request #11886 from gmarek/ratelimit 
Auto commit by PR queue bot
 2015-08-04 11:39:53 -07:00
Jonathan Wills 2fe560ac07 Fix typos in a runtime-generated yaml file 2015-08-04 14:34:21 -04:00
Alex Mohr 7eade1c2ce Merge pull request #11184 from caesarxuchao/patch-replace-doc 
Auto commit by PR queue bot
 2015-08-04 11:18:39 -07:00
Alex Mohr 5068c9ff32 Merge pull request #8905 from justinsb/e2e_log_events_on_service_mutation 
Auto commit by PR queue bot
 2015-08-04 10:58:25 -07:00
Casey D 7e1e9fed29 CoreOS + Calico bare-metal guide 2015-08-04 10:47:14 -07:00
deads2k 182885e897 make testclient more precise 2015-08-04 13:35:59 -04:00
Jordan Liggitt 709c2c8885 Add groups to service account JWT 2015-08-04 13:03:31 -04:00
Alex Mohr 4271f28548 Merge pull request #12185 from brendandburns/queue 
Fix a mis-undersanding about the github API, add more tests
 2015-08-04 09:54:51 -07:00
Dr. Stefan Schimanski 8a48a74103 Factor out validate-cluster.sh call from kube-up.sh 
Not every cluster can be validated the same way. Factoring out the
validate-cluster call into a kube-util.sh function allows customization.

This allows to proceed with GoogleCloudPlatform/kubernetes#10049 before
the mid/long-term unified cluster validation in GoogleCloudPlatform/kubernetes#11908
is implemented. Otherwise, the later blocks the former.
 2015-08-04 16:05:18 +02:00
Filip Grzadkowski 784cef5ff5 Merge pull request #12200 from gmarek/nodecontroller 
NodeController small cleanup
 2015-08-04 15:11:56 +02:00