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

4776 Commits (21b661ecf3038dc50f75d345276c9cf460af9df2)

Author SHA1 Message Date
Tim Hockin 6b0118321e Merge pull request #3280 from zmerlynn/gke_network 
Allow specifying GCE network in GKE provider, default to "e2e" for tests
 2015-01-07 12:49:01 -08:00
Brendan Burns 5963c1735e Merge pull request #3283 from GoogleCloudPlatform/revert-3273-fix_master_conflict 
Revert "Fix inflight merge conflict by adapting rollingupdate to #2861"
 2015-01-07 12:43:26 -08:00
Brendan Burns b11e40cbea Merge pull request #3282 from GoogleCloudPlatform/revert-2861-deads-add-clicfg-types 
Revert "add kubeconfig types"
 2015-01-07 12:43:19 -08:00
Brendan Burns cfffe7049c Revert "Fix inflight merge conflict by adapting rollingupdate to #2861" 2015-01-07 12:42:28 -08:00
Brendan Burns 02dbad7094 Revert "add kubeconfig types" 2015-01-07 12:39:37 -08:00
Joe Beda 7a806b2e57 Design doc for clustering. 
This is related to #2303 and steals from #2435.
 2015-01-07 12:35:38 -08:00
Zach Loafman 15f0068c7d Allow specifying GCE network in GKE provider, default to "e2e" for tests 2015-01-07 12:18:11 -08:00
Brendan Burns 39d1c1aa30 Merge pull request #3255 from brendandburns/master 
Add a little bit more logging to a test
 2015-01-07 11:48:42 -08:00
Brendan Burns 0d69093b63 Merge pull request #3271 from PhilippeDupont/patch-1 
Update etcd-http-read-timeout to match with coreos validator
 2015-01-07 11:46:43 -08:00
derekwaynecarr a56087cdf8 Remove client from attributes, remove admission control interface, fix-up error codes 2015-01-07 14:42:31 -05:00
derekwaynecarr 2820c2c601 Add plugin tests 2015-01-07 14:42:31 -05:00
derekwaynecarr 5ceffe2625 Add tests to ensure resthandler invokes admission control 2015-01-07 14:42:31 -05:00
derekwaynecarr 74d2ee69eb Fix boilerplate and make stub controller 2015-01-07 14:42:31 -05:00
derekwaynecarr 1e2b995a79 Fix admission control in tests 2015-01-07 14:42:31 -05:00
derekwaynecarr 520ae3ef27 Implement basic admission control framework 2015-01-07 14:42:31 -05:00
Clayton Coleman ba53d723d3 Clean up how client is passed to Kubelet in preparation for reading pods 
Also fixes how Kubelet server looks up pods by name when there are multiple
sources.
 2015-01-07 14:40:37 -05:00
Clayton Coleman 880ecef6fe Move locks on watch to allow testing blocking 2015-01-07 14:38:38 -05:00
Clayton Coleman 31fc19efe9 Watching on invalid label/field selectors should error 2015-01-07 14:38:38 -05:00
Clayton Coleman 3b5c3ec786 Merge pull request #3220 from lavalamp/deepEqual 
Add *useful* DeepEqual
 2015-01-07 14:24:26 -05:00
Brendan Burns fa140767eb Kubernetes version v0.8.0-dev 2015-01-07 11:22:53 -08:00
Brendan Burns 2b47f5482c Kubernetes version v0.8.0 2015-01-07 11:22:53 -08:00
Joe Beda c8244cd1b3 Merge pull request #3276 from zmerlynn/fix_common_sh_break 
Commit f1fed3b broke gcs::release in this function, breaking the build.
 2015-01-07 11:14:34 -08:00
Zach Loafman c3858ab322 Commit f1fed3b broke gcs::release in this function, breaking 
the build.
 2015-01-07 11:10:08 -08:00
Clayton Coleman 41e7b2515b Merge pull request #3273 from smarterclayton/fix_master_conflict 
Fix inflight merge conflict by adapting rollingupdate to #2861
 2015-01-07 14:05:47 -05:00
Clayton Coleman e0f0b9c588 Fix inflight merge conflict by adapting rollingupdate to #2861 
ClientConfig changed right as rollingupdate was introduced.
 2015-01-07 13:51:43 -05:00
Clayton Coleman 585d2c8cbd Merge pull request #2861 from deads2k/deads-add-clicfg-types 
add kubeconfig types
 2015-01-07 13:35:50 -05:00
bgrant0607 6e24273937 Merge pull request #3061 from jlowdermilk/rollingupdate 
Add a rollingupdate lib and command to kubectl
 2015-01-07 10:33:39 -08:00
Brendan Burns 005ca49d02 Merge pull request #3254 from pires/hazelcast-example 
Add an example of running Cloud Native Hazelcast on k8s.
 2015-01-07 10:20:06 -08:00
deads2k 0e688dc271 add kubeconfig file 2015-01-07 13:09:10 -05:00
Zach Loafman fd9d2df6e1 Merge pull request #3238 from zmerlynn/gcs_bucket 
Add script to push CI artifacts to gs://kubernetes-release/ci
 2015-01-07 10:08:43 -08:00
Brendan Burns 3d8289258a Merge pull request #3106 from brendandburns/simple 
Add a script suitable for wget https://get.k8s.io | sh installation
 2015-01-07 10:05:26 -08:00
deads2k 12ecd0fa49 bump(imdario/mergo):6633656539c1639d9d78127b7d47c622b5d7b6dc 2015-01-07 13:00:39 -05:00
Tim Hockin 512e262dc8 Merge pull request #3264 from brendandburns/race 
Add a lock around the other docker pull.
 2015-01-07 09:54:47 -08:00
Tim Hockin b7120f27f0 Merge pull request #3265 from rjnagal/cleanup 
Fix few vet errors.
 2015-01-07 09:21:03 -08:00
PhilippeDupont cd055a785c Update master.yaml 
fix incorrect type for "http_read_timeout" (want float64).
 2015-01-07 17:30:19 +01:00
Tim Hockin 051db1de99 Merge pull request #2637 from erictune/service_env_var_2 
Added e2e test: checks service env vars created.
 2015-01-07 08:26:07 -08:00
Tim Hockin ed477a9202 Merge pull request #3245 from satnam6502/es-dns 
Use DNS for Elasticsearch
 2015-01-07 08:25:49 -08:00
Clayton Coleman a0d711816d HealthyRegistry should only decorate minions, not omit them 
Fixes #3098
 2015-01-07 11:09:41 -05:00
PhilippeDupont d2b1817617 Update etcd-http-read-timeout to match with coreos validator 
Refering to https://github.com/coreos/coreos-cloudinit-validator/blob/master/third_party/github.com/coreos/coreos-cloudinit/config/etcd.go#L31
http-read-timeout must be used to fit in coreos validator
 2015-01-07 16:57:09 +01:00
Clayton Coleman cdd14a4db3 Merge pull request #3252 from jbeda/simple-clean 
Make 'make clean' work with Docker not installed.
 2015-01-07 10:55:16 -05:00
Paulo Pires cd946abaf0 Updated discovery source code example. 2015-01-07 12:04:59 +00:00
Paulo Pires 2c6211e692 Fixed typos. 2015-01-07 09:25:47 +00:00
Rohit Jnagal 62ecd5f3ff Fix few vet errors. 
There are quite a few 'composite literal uses unkeyed fields' errors that I have kept out of this patch.
And there's a couple where vet just seems confused. These are the easiest ones.
 2015-01-07 08:40:16 +00:00
Brendan Burns 7c69570663 Add a lock around the other docker pull. 
Fixes e2e (I hope), certainly passes e2e in my client.
 2015-01-07 00:17:57 -08:00
Brendan Burns 4c57ec0f56 Merge pull request #3262 from brendandburns/race 
Revert "Avoid race between image pull and garbage collect"
 2015-01-06 23:24:46 -08:00
Brendan Burns 733e12e19b Revert "Avoid race between image pull and garbage collect" 
This reverts commit 6f14e2e210.
 2015-01-06 23:23:23 -08:00
Brendan Burns e84b4d03a4 Merge pull request #3183 from anguslees/pull-lock 
Avoid race between image pull and garbage collect
 2015-01-06 21:23:29 -08:00
Eric Tune 441445fae4 Added e2e test: checks service env vars created. 2015-01-06 20:50:58 -08:00
Jeff Lowdermlk 0ab39df66b Add a rollingupdate lib and command to kubectl 
Also decouple conditions from client for testability.
 2015-01-06 17:29:05 -08:00
Tim Hockin ded3ef2827 Merge pull request #1185 from lavalamp/numeric 
Numeric type for resources
 2015-01-06 17:05:08 -08:00