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

2528 Commits (0212c9b29ae320bca2250a5f88fec1af5db1a1f8)

Author SHA1 Message Date
Daniel Smith 0212c9b29a Merge pull request #1623 from smarterclayton/rename_jsonbase 
Rename JSONBase -> TypeMeta in preparation for v1beta3
 2014-10-07 10:50:28 -07:00
Clayton Coleman c629e33430 Update non .go references 2014-10-07 13:11:25 -04:00
Daniel Smith 11c2b1ea93 Merge pull request #1621 from smarterclayton/move_helpers 
Move Policy test helpers into their own file
 2014-10-07 09:58:31 -07:00
Joe Beda 037c74b60d Merge pull request #1617 from ghodss/increase_log_level_in_local_up_cluster 
Increase logging levels in hack/local-up-cluster.sh
 2014-10-07 09:12:22 -07:00
Joe Beda cf8e1108e0 Merge pull request #1618 from vishh/fix_update_demo 
Fix update demo
 2014-10-07 09:06:55 -07:00
Joe Beda c7e88427dc Merge pull request #1619 from VojtechVitek/typo 
Fix typo
 2014-10-07 09:04:04 -07:00
Clayton Coleman d3e51a0f24 Rename JSONBase -> TypeMeta in preparation for v1beta3 
Will make subsequent refactor much easier
 2014-10-07 11:12:16 -04:00
Clayton Coleman 363d6554ae Move Policy test helpers into their own file 
Since types.go should always be equal to latest API types.go, this
makes future cut and paste refactors easier.
 2014-10-07 10:24:40 -04:00
Vojtech Vitek (V-Teq) 0ffb1d7fec Fix typo 2014-10-07 14:14:00 +02:00
Vishnu Kannan ecd45031b8 Fix update demo. 2014-10-07 08:03:42 +00:00
Sam Ghods 868c6fe4b8 Increase logging levels in hack/local-up-cluster.sh 2014-10-07 00:07:05 -07:00
Brendan Burns e294cef9d4 Merge pull request #1611 from thockin/netipnet 
Add a flag-compatible wrapper for net.IPNet
 2014-10-06 21:34:45 -07:00
Brendan Burns b2dd4acc43 Merge pull request #1616 from brendandburns/kubelet 
Fix a problem with for loops, copy semantics and async routines.
 2014-10-06 21:26:49 -07:00
bgrant0607 28b8bc33d3 Merge pull request #1614 from ghodss/fix_local_up_cluster 
Fix hack/local-up-cluster.sh to ensure apiserver comes up
 2014-10-06 21:21:19 -07:00
Brendan Burns 7ecd8d7207 Fix a problem with for loops, copy semantics and async routines. 2014-10-06 21:20:00 -07:00
bgrant0607 3e2ace5f54 Merge pull request #951 from meirf/selector-string-form 
extend selector with EXISTS, new tests/some old tests use table-driven style
 2014-10-06 21:15:46 -07:00
Sam Ghods 97dd16b913 Fix hack/local-up-cluster.sh to ensure apiserver comes up 2014-10-06 19:38:27 -07:00
Tim Hockin 65b4247892 Merge pull request #1609 from ddysher/fix-controller 
Improve replication controller errro handling.
 2014-10-06 18:30:08 -07:00
Tim Hockin 0d74fe74cd Add a flag-compatible wrapper for net.IPNet 2014-10-06 18:28:49 -07:00
Meir Fischer 89a9e5e672 extend selector with EXISTS, new tests/some old tests use table-driven style; add Has to Labels interface; enforce Requirement restrictions in constructor 2014-10-06 21:10:11 -04:00
Deyuan Deng 1454d5d174 Improve replication controller errro handling. 2014-10-06 21:02:51 -04:00
Tim Hockin eb24c997e4 Merge pull request #1606 from lavalamp/fix 
Try to fix flakiness by increasing timeouts
 2014-10-06 17:22:51 -07:00
Daniel Smith a744623948 Try to fix flakiness by increasing timeouts, because that is always the best way to perform such a fix. 2014-10-06 17:14:34 -07:00
Daniel Smith 6449b30ca4 Merge pull request #1593 from thockin/utilerrlist 
Move ErrorList to util
 2014-10-06 16:59:34 -07:00
Brendan Burns fca26ccc65 Merge pull request #1569 from dchen1107/termination 
Initial support to propagating the termination reasons and image failures
 2014-10-06 16:56:23 -07:00
Brendan Burns 130784bfdf Merge pull request #1594 from thockin/ipallocator 
Add an IPAllocator type
 2014-10-06 16:56:00 -07:00
Daniel Smith e26bdd0721 Merge pull request #1591 from smarterclayton/simple_test 
Add a Log method on Scheme for better debugging
 2014-10-06 15:39:51 -07:00
Dawn Chen 4fdfeaa30e Addressed comments. 2014-10-06 14:41:20 -07:00
Dawn Chen a86d496f9a Fix e2e tests. 2014-10-06 13:37:24 -07:00
Dawn Chen 39f648bda2 Fix rebase issues. 2014-10-06 13:37:23 -07:00
Dawn Chen 8d0ed93aa1 Clean unittests 2014-10-06 13:37:22 -07:00
Dawn Chen 9861eb7c8e Initial support of propogating the termination reasons and image failure 
to apiserver. Deprecated docker.Container from API completely.

Conflicts:
	pkg/api/types.go
	pkg/kubelet/kubelet.go
 2014-10-06 13:37:22 -07:00
Brendan Burns ab6065944c Merge pull request #1584 from thockin/net 
Flag-compatible IP type
 2014-10-06 13:35:48 -07:00
Brendan Burns 7c694d2cad Merge pull request #1596 from thockin/unbound 
Better handling of unbound pods.
 2014-10-06 13:31:41 -07:00
Joe Beda 0de2ef496e Merge pull request #1595 from thockin/flageq 
Use '=' for flags or else parsing gets confused sometimes
 2014-10-06 13:14:35 -07:00
Daniel Smith cc086908aa Merge pull request #1578 from brendandburns/controller 
Extract the service controller from the apiserver.
 2014-10-06 12:44:41 -07:00
Tim Hockin 372aa07b58 Better handling of unbound pods. 
A small collection of tweaks to better handle pods when they are not currently
bound to a host.
 2014-10-06 12:27:18 -07:00
Tim Hockin 440d14c239 Use '=' for flags or else parsing gets confused sometimes 2014-10-06 12:25:56 -07:00
Tim Hockin 7e83211840 Move ErrorList to util 2014-10-06 12:12:35 -07:00
Tim Hockin 0ad0a247c4 Flag-compatible IP type 2014-10-06 11:29:22 -07:00
Brendan Burns 51a8c43370 Merge pull request #1587 from ddysher/add-etcdctl 
Add etcdctl in master
 2014-10-06 11:06:12 -07:00
bgrant0607 346e9fe526 Merge pull request #1585 from brendandburns/ux 
Add services and replica controllers to the ux.
 2014-10-06 10:46:04 -07:00
Daniel Smith 98f9a4b05b Merge pull request #1590 from ddysher/fix-registry 
Fix bug in minion registrytest.
 2014-10-06 10:02:10 -07:00
Tim Hockin 8131a5ca6a Add an IPAllocator type 2014-10-06 09:02:04 -07:00
erictune 6947331290 Merge pull request #1588 from meirf/consistent-grammar-conforms-usage 
minor comment change for grammar/consistency across v1beta* packages
 2014-10-06 08:30:18 -07:00
Clayton Coleman 305db35422 Add a Log method on Scheme for better debugging 2014-10-05 17:17:25 -04:00
Deyuan Deng 7bae027604 Fix bug in minion registrytest. 2014-10-05 15:55:26 -04:00
Meir Fischer 073940e66f minor comment change for grammar/consistency across v1beta* packages 2014-10-05 01:22:05 -04:00
bgrant0607 a0bb739609 Merge pull request #1534 from proppy/kubelet-noonce 
kubelet: add --runonce flag
 2014-10-04 15:48:44 -07:00
Deyuan Deng 253907ab04 Add etcdctl in master 2014-10-04 11:26:01 -04:00