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

2594 Commits (1a1b0699bc7372f333cc2d900bba684b2b0a96c0)

Author SHA1 Message Date
Daniel Smith 1a1b0699bc Merge pull request #1604 from brendandburns/resource 
Add a least-requested priority function
 2014-10-08 17:26:57 -07:00
Brendan Burns e3d47a3abb Merge pull request #1661 from scollier/gsg_update 
adding option  for updated package
 2014-10-08 17:18:06 -07:00
Brendan Burns 6913cf4b49 Merge pull request #1666 from lavalamp/fix 
Load cadvisor connection in background.
 2014-10-08 17:16:11 -07:00
Daniel Smith 1fc92bef53 Load cadvisor connection in background. 2014-10-08 17:06:41 -07:00
Daniel Smith 5d24820dd5 Merge pull request #1464 from hmrm/add-etcd-config 
Allow etcd config file to be passed to apiserver, kubelet, and proxy
 2014-10-08 16:29:46 -07:00
Scott Collier 5908beb2cf adding option for updated package 2014-10-08 17:39:26 -05:00
Brendan Burns 4230a8ca61 Add a least-requested priority function 2014-10-08 15:31:38 -07:00
Clayton Coleman 467a7a2cc1 Merge pull request #1659 from lavalamp/fix 
Fix v1beta2 types having been copied incorrectly.
 2014-10-08 18:10:13 -04:00
Daniel Smith af5714da12 Fix v1beta2 types having been copied incorrectly. 2014-10-08 14:15:50 -07:00
Daniel Smith e1cb72f1ae Merge pull request #1643 from smarterclayton/make_resource_version_a_string 
Make ResourceVersion internally a string instead of uint64
 2014-10-08 14:00:37 -07:00
Tim Hockin c6acda63a8 Merge pull request #1656 from matttproud/documentation/use-relative-links 
Swap internal doc. refs to relative links.
 2014-10-08 13:15:48 -07:00
Clayton Coleman 094bc3796a Update ObjectReference to use ResourceVersion string everywhere 
Breaks backwards compat for anyone using older versions
 2014-10-08 15:57:38 -04:00
Daniel Smith 9ffe821bfd Merge pull request #1657 from brendandburns/nginx 
Add a css file I forgot.
 2014-10-08 12:34:33 -07:00
Brendan Burns 06a4593f25 Add a css file I forgot. 2014-10-08 12:28:31 -07:00
Matt T. Proud 8a911b39af Swap internal doc. refs to relative links. 
This commit addresses issue #1571, which requests that all internal
Kubernetes links are swapped to relative ones to better facilitate
browsing of documentation on local forks, not to mention make the
documentation have less needless boilerplate.
 2014-10-08 21:09:18 +02:00
Daniel Smith 98ac8e178f Merge pull request #1650 from eparis/assetfs-godeps 
update Godeps.json with github.com/elazarl/go-bindata-assetfs
 2014-10-08 11:52:32 -07:00
Brendan Burns 0db4d27460 Merge pull request #1652 from eparis/godeps-doc 
update basic rules how to use godeps
 2014-10-08 11:50:55 -07:00
Eric Paris 3ecbfa20ee update basic rules how to use godeps 
seemed to be a couple of gotchas which make godeps harder for some people
to use.  explain how I make it work.
 2014-10-08 14:42:04 -04:00
Eric Paris 9828d8e9cc update Godeps.json with github.com/elazarl/go-bindata-assetfs 2014-10-08 14:28:03 -04:00
Daniel Smith 119fc0ebbf Merge pull request #1647 from thockin/cleanup 
move completions from misc to contrib
 2014-10-08 11:08:49 -07:00
Clayton Coleman e27dacb1e4 Merge pull request #1648 from deads2k/dev/deads/tidy-compile-regex-api 
make api match intent with less specific type
 2014-10-08 13:50:08 -04:00
deads2k e348b939bf make api match intent with less specific type 2014-10-08 10:01:55 -04:00
Tim Hockin af3983464c move completions from misc to contrib 2014-10-07 22:20:32 -07:00
Tim Hockin 45f9f39b51 Merge pull request #1597 from thockin/iptables 
Add a pkg for iptables support
 2014-10-07 17:31:34 -07:00
Tim Hockin 2f2ef05fa8 Merge pull request #1646 from dchen1107/termination 
Fix an issue on GetContainerInfo.
 2014-10-07 17:27:56 -07:00
Dawn Chen 300c2c5f6f Fix an issue on GetContainerInfo. 
I believe the issue was first introduced when we append namespace to docker
container's name. This is a temporary fix for #160.
 2014-10-07 17:21:24 -07:00
Clayton Coleman a5462c0678 Change test cases to verify the client sends the received resourceVersion 2014-10-07 19:00:26 -04:00
Clayton Coleman 82bcdd3b3b Make ResourceVersion a string internally instead of uint64 
Allows us to define different watch versioning regimes in the future
as well as to encode information with the resource version.

This changes /watch/resources?resourceVersion=3 to start the watch at
4 instead of 3, which means clients can read a resource version and
then send it back to the server. Clients should no longer do math on
resource versions.
 2014-10-07 19:00:26 -04:00
erictune 0d2ce69574 Merge pull request #1445 from brendandburns/docs 
Add some documentation for the container environment.
 2014-10-07 15:44:35 -07:00
Daniel Smith 31e02b882b Merge pull request #1640 from ddysher/restclient_test 
Add codec to restlient test.
 2014-10-07 15:31:09 -07:00
Deyuan Deng 9047baa111 Add codec to restlient test. 2014-10-07 18:26:26 -04:00
Brendan Burns 4fe958f6cd Add some documentation for the container environment. 2014-10-07 15:00:17 -07:00
Haney Maxwell 4d87159eda Allow etcd config file to be passed to apiserver, kubelet, and proxy 2014-10-07 14:25:54 -07:00
Tim Hockin 48a9ed3147 Merge pull request #1637 from lavalamp/fix 
Fix 'go vet' issues
 2014-10-07 14:25:41 -07:00
Daniel Smith ee107d3fad fix extra un-cosmetic extraneous code. 2014-10-07 14:08:18 -07:00
Daniel Smith 4dd3094035 Fix mismatched arg and formatter in Errorf 2014-10-07 14:03:06 -07:00
Daniel Smith 9c0fafee39 Merge pull request #1636 from dchen1107/termination 
Add the missing arg in Errorf.
 2014-10-07 14:01:55 -07:00
Daniel Smith 2dde76bd03 Fix struct tag in apparently untested config struct 2014-10-07 14:01:45 -07:00
Daniel Smith 2d048bc0f2 fix captured loop variable 2014-10-07 13:57:30 -07:00
Daniel Smith 7ffe791486 fix error message in validation test 2014-10-07 13:54:41 -07:00
Dawn Chen 73c8f41737 Add the missing arg in Errorf. 2014-10-07 13:53:25 -07:00
Daniel Smith 3a62089790 Fix malformed namespace json tag 2014-10-07 13:52:51 -07:00
Daniel Smith 9a82a92764 Merge pull request #1620 from jhadvig/podex_envar 
podex - DOCKER_HOST envar check
 2014-10-07 13:42:53 -07:00
Daniel Smith 386caae675 Merge pull request #1478 from ddysher/minion-etcd 
Use etcd as backend for minion registry.
 2014-10-07 13:36:09 -07:00
Joe Beda 491579a98e Merge pull request #1632 from brendandburns/fix 
Fix the exec test, on os x false and true have different paths
 2014-10-07 13:35:54 -07:00
Brendan Burns 5bdb061f14 Fix the exec test, on os x false and true have different paths, but they're in $PATH on all. 2014-10-07 13:26:25 -07:00
jhadvig e7af7b52c7 podex - DOCKER_HOST envar check 2014-10-07 22:26:03 +02:00
Deyuan Deng 4de810efb4 Rebase to master, change JSONBase to TypeMeta. 2014-10-07 16:22:36 -04:00
Deyuan Deng c3d9197a4b Rename InsertMinion to CreateMinion. 2014-10-07 16:22:35 -04:00
Deyuan Deng 4a35325f29 Use etcd as backend for minion registry. 2014-10-07 16:22:35 -04:00