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

18843 Commits (ddda379b1b20ef59a9699237ef36afc83f8fe39c)

Author SHA1 Message Date
jackgr ddda379b1b Add method to apply strategic merge patch. 2015-10-07 17:14:11 -07:00
Quinton Hoole 5bb53fbb4c Merge pull request #15271 from quinton-hoole/2015-10-07-kubemark 
Bring up a 4000 node kubemark cluster in Jenkins.
 2015-10-07 16:47:54 -07:00
Quinton Hoole 1b7f8f540e Bring up a 4000 node kubemark cluster in Jenkins. 
This is a bit of a hack of the existing scripts, but the quickest way to get this cluster up.
Will restructure e2e.sh to do this in a more sane way in a separate PR.
 2015-10-07 16:46:32 -07:00
Janet Kuo aa307da594 Merge pull request #15124 from timstclair/container-id 
Use strong type for container ID
 2015-10-07 15:15:16 -07:00
Janet Kuo 4b8f91fd0e Merge pull request #15190 from dchen1107/fix 
unset Kubelet flag for manifest_url for master node.
 2015-10-07 14:48:35 -07:00
Mike Danese 1769c1c34b Merge pull request #15006 from madhusudancs/move-hooks-to-commit 
Move the hooks section to the commit section.
 2015-10-07 14:04:55 -07:00
Mike Danese b6734d5572 Merge pull request #15213 from mwielgus/cluster_doc 
Updated doc for cluster autoscaler
 2015-10-07 14:04:42 -07:00
Mike Danese efbbfde71c Merge pull request #14094 from ZJU-SEL/pod-example 
Demo a sidecar mode within pod for java users
 2015-10-07 14:03:44 -07:00
Mike Danese be0c6198b9 Merge pull request #14446 from derekwaynecarr/runtime_constraints_example 
Add an example demonstrating runtime constraints
 2015-10-07 14:02:56 -07:00
Mike Danese 591d7c42a4 Merge pull request #15198 from mikedanese/ds-bug-2 
include name match in mischeduled check in daemonset controller
 2015-10-07 13:54:42 -07:00
Brendan Burns 3e6b6d9cfb Merge pull request #15242 from mikedanese/sw-fix 
fix master swagger spec
 2015-10-07 13:34:14 -07:00
Dawn Chen c29296f9a8 Set manifest-url-header when enable_manifest_url is set 2015-10-07 13:27:03 -07:00
Nikhil Jindal c5d534e4f6 Merge pull request #15159 from ironcladlou/deployment-controller-tests 
Add unit tests for deployment controller
 2015-10-07 13:20:30 -07:00
Paul Morie 43f9280a5d Merge pull request #15127 from swagiaal/bump-go-dockerclient 
Bump fsouza/go-dockerclient
 2015-10-07 14:02:24 -04:00
Tim St. Clair 551eff63b8 Use strong type for container ID 
Change all references to the container ID in pkg/kubelet/... to the
strong type defined in pkg/kubelet/container: ContainerID

The motivation for this change is to make the format of the ID
unambiguous, specifically whether or not it includes the runtime
prefix (e.g. "docker://").
 2015-10-07 10:58:05 -07:00
Mike Danese 0d9d81ff57 fix master swagger spec 2015-10-07 10:23:22 -07:00
Dawn Chen 092dddd12c Merge pull request #15087 from derekwaynecarr/kernel_overcommit 
Kubelet sets kernel overcommit_memory flag
 2015-10-07 09:47:47 -07:00
Zach Loafman 418a8b5022 Merge pull request #14959 from ihmccreery/publish-pinned-rebased 
Add major- and minor-pinned latest.txt and stable.txt release publications
 2015-10-07 09:07:11 -07:00
k8s-merge-robot b0d748efb0 Merge pull request #14461 from JanetKuo/kubectl-api-group-cmd 
Auto commit by PR queue bot
 2015-10-07 07:29:10 -07:00
k8s-merge-robot 83433a1ebd Merge pull request #14499 from erictune/scratch-fix 
Auto commit by PR queue bot
 2015-10-07 07:00:09 -07:00
Derek Carr 87fe1f4af8 Merge pull request #13939 from pmorie/pod-sc-minimal 
Add PodSecurityContext and backward compatibility tests
 2015-10-07 09:56:58 -04:00
Filip Grzadkowski fa97035389 Merge pull request #15063 from mwielgus/cluster_autoscaler_config 
Experimental Cluster Autoscaler configuration object
 2015-10-07 13:48:52 +02:00
Filip Grzadkowski 6429c39a9e Merge pull request #15220 from kubernetes/revert-14876-proxy_https 
Revert "Allow specifying scheme when proxying"
 2015-10-07 13:04:24 +02:00
Marek Grabowski 1ea59513cb Merge pull request #15216 from gmarek/predicates 
Change logging in scheduler_predicates e2e test
 2015-10-07 13:03:56 +02:00
Filip Grzadkowski c0532a432a Revert "Allow specifying scheme when proxying" 2015-10-07 13:02:35 +02:00
Marcin Wielgus b9f13ded6f Experimental Cluster Autoscaler configuration object 2015-10-07 12:01:20 +02:00
Filip Grzadkowski 887aeaa101 Merge pull request #15214 from piosz/e2e-fix 
Fixed flaky cluster size autoscaling e2e.
 2015-10-07 11:34:27 +02:00
Piotr Szczesniak a8bd23542f Fixed flaky cluster size autoscaling e2e. 2015-10-07 11:22:28 +02:00
gmarek 3b11feda97 Change logging in scheduler_predicates e2e test 2015-10-07 11:10:48 +02:00
Marcin Wielgus bc58341d34 Updated doc for cluster autoscaler 2015-10-07 10:58:33 +02:00
Filip Grzadkowski c1345ce2d9 Merge pull request #15068 from wojtek-t/fix_default_limits 
Tweak limits for system pods in manifest files.
 2015-10-07 09:41:28 +02:00
k8s-merge-robot 348f0ca335 Merge pull request #14686 from yifan-gu/rkt_gc 
Auto commit by PR queue bot
 2015-10-07 00:15:48 -07:00
k8s-merge-robot eea83ee930 Merge pull request #14722 from mqliang/pod-sort 
Auto commit by PR queue bot
 2015-10-06 23:32:03 -07:00
k8s-merge-robot 67768eb51c Merge pull request #14769 from lavalamp/parallel_tests 
Auto commit by PR queue bot
 2015-10-06 22:59:50 -07:00
k8s-merge-robot 61b3fecb1a Merge pull request #14876 from liggitt/proxy_https 
Auto commit by PR queue bot
 2015-10-06 22:29:38 -07:00
k8s-merge-robot e99cfb1311 Merge pull request #14922 from fabianofranz/bump_cobra_pflag 
Auto commit by PR queue bot
 2015-10-06 21:32:15 -07:00
k8s-merge-robot 5979655da1 Merge pull request #14949 from brendandburns/flakes10 
Auto commit by PR queue bot
 2015-10-06 21:01:33 -07:00
Mike Danese 1ac70ecadc Merge pull request #15196 from mikedanese/ds-bug 
don't count nodes with 0 daemonpods running when 0 should be running as mischeduled.
 2015-10-06 20:08:00 -07:00
k8s-merge-robot da0ba77ce3 Merge pull request #15040 from caesarxuchao/fix-gen-swagger-docs.sh 
Auto commit by PR queue bot
 2015-10-06 19:42:12 -07:00
Mike Danese d601bfa1bb fix bug in daemonset 2015-10-06 18:18:18 -07:00
Janet Kuo f4cb23975b Merge pull request #15044 from nikhiljindal/deploymentController 
Enabling deployments on kubernernetes-upgrade-gce test suite
 2015-10-06 18:11:00 -07:00
Dawn Chen 37720e8899 unset Kubelet flag for manifest_url for master node. 2015-10-06 17:33:29 -07:00
Paul Morie 123a5bd465 Merge pull request #13978 from jayunit100/api_server_append_13152 
NodePort option: Allowing for apiservers behind load-balanced endpoint.
 2015-10-06 20:09:03 -04:00
Mike Danese 5a441d4ad1 include name match in mischeduled check in daemonset controller 2015-10-06 17:01:54 -07:00
k8s-merge-robot d327f4a782 Merge pull request #15134 from liggitt/scheduler_kind 
Auto commit by PR queue bot
 2015-10-06 16:57:36 -07:00
Abhi Shah 60b1abdaa5 Merge pull request #15178 from ArtfulCoder/stablekubeproxytest 
increased number of tries to reduce test flakiness
 2015-10-06 16:40:31 -07:00
Jeff Lowdermilk 8b37e74fd0 Merge pull request #15184 from jlowdermilk/gke-reboot-test 
Don't skip reboot when testing reboot
 2015-10-06 16:10:30 -07:00
Jeff Lowdermilk fafb00db7a Merge pull request #15165 from jlowdermilk/gke-skip-shell 
Re-add Shell to gke required filter
 2015-10-06 15:44:37 -07:00
nikhiljindal c062afc6de Enabling deployments on kubernernetes-upgrade-gce test suite 2015-10-06 14:50:25 -07:00
k8s-merge-robot 57a08b5563 Merge pull request #15148 from piosz/registry-addon 
Auto commit by PR queue bot
 2015-10-06 14:43:45 -07:00