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

2978 Commits (71727385e872444817e8b5da3a4a7797c3952612)

Author SHA1 Message Date
k8s-merge-robot 30375b21d6 Merge pull request #19776 from justinsb/aws_sync_kubeup_gce 
Auto commit by PR queue bot
 2016-02-01 14:44:18 -08:00
k8s-merge-robot b4d1c7541c Merge pull request #19870 from justinsb/salt_systemd_force 
Auto commit by PR queue bot
 2016-02-01 10:49:44 -08:00
k8s-merge-robot a5f03173c5 Merge pull request #19869 from justinsb/aws_fix_docker183_package_name 
Auto commit by PR queue bot
 2016-02-01 10:18:06 -08:00
k8s-merge-robot 0aca70016c Merge pull request #20066 from justinsb/aws_move_build_runtime_config 
Auto commit by PR queue bot
 2016-02-01 09:48:27 -08:00
k8s-merge-robot bea271a767 Merge pull request #19664 from yifan-gu/docker_restart 
Auto commit by PR queue bot
 2016-02-01 06:46:36 -08:00
Marcin Wielgus bdf563be4b Use Heapster v0.20.0-alpha3 2016-02-01 12:22:11 +01:00
Marcin Wielgus a14f791d8c Revert "Merge pull request #20329 from kubernetes/revert-20323-bump-influxdb" 
This reverts commit b4188ec459, reversing
changes made to 28951bd66a.
 2016-02-01 12:12:37 +01:00
Yifan Gu 05087612b9 salt: Try 'systemctl' if 'service' command fails when restarting docker. 2016-02-01 18:10:31 +08:00
Alex Robinson f684e80b1f Merge pull request #20067 from justinsb/aws_test_defaults 
AWS: Change config-test defaults to match GCE
 2016-01-30 17:42:28 -08:00
Alex Robinson a81e6c3f4f Merge pull request #20307 from dchen1107/test1 
Deprecated soon: override /etc/init.d/docker file on containervm image,
 2016-01-30 13:32:41 -08:00
k8s-merge-robot e953f4a074 Merge pull request #19628 from mikedanese/dns-headless 
Auto commit by PR queue bot
 2016-01-29 23:54:40 -08:00
k8s-merge-robot 40ff292294 Merge pull request #20286 from mikedanese/kube-ui-v5 
Auto commit by PR queue bot
 2016-01-29 10:51:00 -08:00
Filip Grzadkowski 13480c171d Revert "Yet another try to migrate to the new Heapster" 2016-01-29 15:03:49 +01:00
Piotr Szczesniak 7d4a948b1f Yet another try to migrate to the new Heapster 2016-01-29 09:56:49 +01:00
Piotr Szczesniak 0c5cc1bde1 Revert "Merge pull request #20215 from kubernetes/revert-20156-bump-influxdb" 
This reverts commit 06996d5af9, reversing
changes made to b2f6e7d08f.
 2016-01-29 09:19:03 +01:00
k8s-merge-robot 992a85950f Merge pull request #19326 from fgimenez/juju-allow-privileged 
Auto commit by PR queue bot
 2016-01-28 22:27:32 -08:00
Dawn Chen 5f6f6acec7 Deprecated soon: override /etc/init.d/docker file on containervm image, 
so that we can unblock docker 1.10 validation.
 2016-01-28 17:44:23 -08:00
Fabio Yeon 574f354b73 Merge pull request #20143 from roberthbailey/list-resources-gke 
Fix list-resources.sh to work with the GKE provider
 2016-01-28 13:48:05 -08:00
Mike Danese b1ca73a5b2 kube-ui: upgrade to v5 2016-01-28 13:02:25 -08:00
Justin Santa Barbara c556e8f0f5 kube-up: Refactor kube-env into common; use in AWS 
Use kube-env on the AWS master also
 2016-01-28 10:31:51 -08:00
Justin Santa Barbara 4d88a4ed2c kube-up: move sha1sum-file into common 
Also hash the tar files in AWS kube-up
 2016-01-28 10:19:38 -08:00
Justin Santa Barbara a70412099a AWS: add retries around apt-get install 
Related to issue #17309
 2016-01-28 10:19:38 -08:00
Justin Santa Barbara ae75a7d259 kube-up: move build-runtime-config from AWS & GCE into common 2016-01-28 10:19:38 -08:00
Justin Santa Barbara 0df6f5d8c5 kube-up: move yaml-quote from GCE & AWS to common 2016-01-28 10:19:38 -08:00
Prashanth B 952449585e Merge pull request #20164 from bprashanth/glbc_0.5.2 
Bump glbc to 0.5.2
 2016-01-28 08:21:32 -08:00
k8s-merge-robot 458eb5284a Merge pull request #19105 from smarterclayton/prepare_negotiate 
Auto commit by PR queue bot
 2016-01-27 13:35:30 -08:00
k8s-merge-robot a95f1b84cb Merge pull request #17243 from yifan-gu/gce_coreos 
Auto commit by PR queue bot
 2016-01-27 13:02:20 -08:00
Brendan Burns 4f845ad6e1 Merge pull request #19642 from MikeSpreitzer/issue/19618 
Introduce FLANNEL_OTHER_NET_CONFIG
 2016-01-27 12:20:11 -08:00
Zach Loafman 9caf0a7e72 Merge pull request #20221 from zmerlynn/cvm-new-2 
REALLY bump to container-vm-v20160127
 2016-01-27 10:31:28 -08:00
Zach Loafman cb9afa65f0 REALLY bump to container-vm-v20160127 2016-01-27 10:28:04 -08:00
Brendan Burns 6f15b532f7 Merge pull request #20218 from zmerlynn/cvm-new 
Bump to container-vm-v20160127
 2016-01-27 10:24:24 -08:00
Zach Loafman 727fb1a97a Bump to container-vm-v20160127 2016-01-27 09:22:07 -08:00
Filip Grzadkowski 0dedf869c7 Revert "Bumped Heapster version to v0.20.0-alpha and Influxdb to 0.9.2.1" 2016-01-27 17:22:36 +01:00
Piotr Szczesniak e96993f2ce Bumped Heapster version to v0.20.0-alpha and Influxdb to 0.9.2.1 2016-01-27 11:09:18 +01:00
k8s-merge-robot 86dd321c73 Merge pull request #19489 from cloudnativeapps/vsphere-support-1 
Auto commit by PR queue bot
 2016-01-26 22:27:55 -08:00
k8s-merge-robot 738eae88f8 Merge pull request #19841 from marun/vagrant-fedora23 
Auto commit by PR queue bot
 2016-01-26 18:45:48 -08:00
Alex Robinson 6acf297231 Update the fluentd versions to include fixes for #19405. 2016-01-27 00:30:53 +00:00
Alex Robinson ac13e851e2 Don't let fluentd pipe its own logs directly back into itself. 2016-01-27 00:30:53 +00:00
Alex Robinson 95a4ea3fc8 Increase the fluentd buffer chunk size to improve write throughput. 
Also reduce the max wait between retries, 30 seconds should be more than
enough backoff.
 2016-01-27 00:30:50 +00:00
Robert Bailey a8cad507db Fix list-resources.sh to work with the GKE provider. Also update 
the grep command to work for versions of grep that don't
understand '\s'.
 2016-01-26 15:05:29 -08:00
Clayton Coleman 38c7eded99 Prepare for content-type negotiation 
Combine the fields that will be used for content transformation
(content-type, codec, and group version) into a single struct in client,
and then pass that struct into the rest client and request. Set the
content-type when sending requests to the server, and accept the content
type as primary.

Will form the foundation for content-negotiation via the client.
 2016-01-26 17:44:30 -05:00
Prashanth Balasubramanian eecfdc065b Bump glbc to 0.5.2 2016-01-26 10:40:07 -08:00
Zach Loafman 23b4bfb370 Merge pull request #20126 from kubernetes/revert-19957-container-vm-v20160121 
Revert "Bump to container-vm-v20160121"
 2016-01-26 10:38:32 -08:00
k8s-merge-robot 6c63acdd3d Merge pull request #19398 from justinsb/aws_elasticip_for_master 
Auto commit by PR queue bot
 2016-01-26 04:34:28 -08:00
k8s-merge-robot 8c821700f3 Merge pull request #19389 from justinsb/internal_cidr 
Auto commit by PR queue bot
 2016-01-26 03:58:48 -08:00
k8s-merge-robot 3f40fb7d0a Merge pull request #17923 from yuvipanda/kube2dns-pflag 
Auto commit by PR queue bot
 2016-01-26 02:13:44 -08:00
k8s-merge-robot 2286bd3a38 Merge pull request #19961 from mamikonyana/newrepo 
Auto commit by PR queue bot
 2016-01-25 19:51:23 -08:00
k8s-merge-robot bd97eec9b6 Merge pull request #19928 from jfchevrette/fix_ubuntu_sysv_init 
Auto commit by PR queue bot
 2016-01-25 19:50:47 -08:00
k8s-merge-robot 110f995484 Merge pull request #19748 from freehan/registry 
Auto commit by PR queue bot
 2016-01-25 19:48:10 -08:00
Maru Newby e709e91c64 Vagrant fixes for fedora 23 
- wget is not installed by default on fedora 23.  Use curl instead
   since it is always available on recent Fedora.

 - The repo url for cockpit resulted in an http redirect message being
   saved as the repo file which broke deployment.  Update the url to
   url that was redirected to and ensure that future redirects will be
   handled correctly.

 - The main Fedora 23 repo includes salt packages, and there is no
   salt repo for 23.  The salt bootstrap still creates a repo file for
   a nonexistent repo, though, and this change removes it to avoid
   having dnf report an error on every update.
 2016-01-26 00:33:01 +00:00