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

23308 Commits (23fd5e9a33c5ab42391deb7704f23166128d3ca4)

Author SHA1 Message Date
k8s-merge-robot f3793d0942 Merge pull request #19359 from smarterclayton/add_proto_to_build_image 
Auto commit by PR queue bot
 2016-01-15 07:56:23 -08:00
k8s-merge-robot 21aa683fb5 Merge pull request #18974 from pmorie/config-env 
Auto commit by PR queue bot
 2016-01-15 06:42:56 -08:00
k8s-merge-robot 68a6147454 Merge pull request #19543 from ihmccreery/autoscaling-skips 
Auto commit by PR queue bot
 2016-01-15 06:10:59 -08:00
Marek Grabowski 5484bef6d3 Merge pull request #19697 from gmarek/master 
Functionally revert #19381
 2016-01-15 14:39:16 +01:00
gmarek 3a1463fea8 Functionally revert #19381 2016-01-15 14:36:42 +01:00
Marek Grabowski b349a0c857 Merge pull request #19693 from gmarek/master 
Run only reboot tests in reboot suite.
 2016-01-15 12:29:50 +01:00
gmarek b7d1cacbff Run only reboot tests in reboot suite. 2016-01-15 12:26:43 +01:00
Marek Grabowski 6820ffb634 Merge pull request #19692 from kubernetes/revert-19687-master 
Revert "Print HR output in e2e tests before figuring out how to make the JSON…"
 2016-01-15 11:57:39 +01:00
Marek Grabowski 61884ab0b5 Revert "Print HR output in e2e tests before figuring out how to make the JSON…" 2016-01-15 11:53:38 +01:00
Marek Grabowski 1d8576a486 Merge pull request #19688 from gmarek/master 
Print only interesting Kubelet metrics in JSON printer
 2016-01-15 11:30:14 +01:00
Piotr Szczesniak 04040e72dc Remove autoscaling.md outdate proposal 2016-01-15 11:06:19 +01:00
gmarek ed7e9bfb20 Print only interesting Kubelet metrics in JSON printer 2016-01-15 09:57:07 +01:00
combk8s 5b383dad62 fix image gc bug 2016-01-15 16:43:22 +08:00
Marek Grabowski 9e704082e8 Merge pull request #19687 from gmarek/master 
Print HR output in e2e tests before figuring out how to make the JSON…
 2016-01-15 09:23:56 +01:00
gmarek 548b3b2fc1 Print HR output in e2e tests before figuring out how to make the JSON output shorter 2016-01-15 09:14:43 +01:00
k8s-merge-robot 0834890c42 Merge pull request #17741 from freehan/nodedown 
Auto commit by PR queue bot
 2016-01-15 00:02:48 -08:00
harry 98222b4d8b Replace to tag 
Use a testing pkg to replace testing util codes
 2016-01-15 15:07:21 +08:00
k8s-merge-robot ec002e52ab Merge pull request #19661 from mikedanese/le-config 
Auto commit by PR queue bot
 2016-01-14 22:27:14 -08:00
Harry Zhang 936a11e775 Use networking to hold network related pkgs 
Change names of unclear methods

Use net as pkg name for short
 2016-01-15 13:46:16 +08:00
Mike Danese 33c72db59c Merge pull request #19528 from resouer/strings-util 
Create strings pkg to fix util issue
 2016-01-14 21:19:17 -08:00
harry 7405c7899b Add strings pkg to hold strings utils 
Replace funtions with strings pkg

Fix all references and rename the pkg
 2016-01-15 12:37:50 +08:00
Nan Xiao 59df63d8a7 Update mesos.md 
#18954 should also be merged into master branch.
 2016-01-15 10:27:02 +08:00
Minhan Xia 01829432db update pod status once node becomes NotReady 2016-01-14 17:41:36 -08:00
Mike Danese 533a42948e Merge pull request #19553 from liggitt/abac_typo 
Fix example ABAC policy file
 2016-01-14 17:04:41 -08:00
Mike Danese 558d0cc65d Merge pull request #19617 from hongchaodeng/watch_cache 
small refactor on watch cache
 2016-01-14 17:04:13 -08:00
Mike Danese 82509a46a7 Merge pull request #19585 from smarterclayton/skip_mount 
Skip format and mount test on windows or mac
 2016-01-14 17:03:44 -08:00
Yifan Gu eb9c5ae59e jenkins: Set '--nodes' when 'GINKGO_PARALLEL' is set. 
By default, if 'GINKGO_PARALLEL' is true, then '--nodes=$GINKGO_PARALLEL_NODES'
will be passed. The default 'GINKGO_PARALLEL_NODES' is 30.
 2016-01-14 16:23:44 -08:00
Phillip Wittrock bb216e53da Define stats api fields for exporting filesystem metrics #17331 2016-01-14 15:52:35 -08:00
Isaac Hollander McCreery 93d6ac8556 Skip [Feature:.+] instead of [Feature] 2016-01-14 15:43:41 -08:00
Yu-Ju Hong c9faecba9d Merge pull request #19668 from Random-Liu/fix-bug-in-reconcile 
Fix bug in needsReconcile
 2016-01-14 14:29:29 -08:00
Mike Danese 919c011d96 Merge pull request #19640 from MikeSpreitzer/issue/19484 
Make deployAddons.sh ensure KUBE_CONFIG_FILE is defined
 2016-01-14 14:09:05 -08:00
Mike Danese 9745d1cbf0 Merge pull request #19626 from mikedanese/kubelet-labels 
kubelet: use ConfigurationMap instead of json
 2016-01-14 14:08:53 -08:00
Isaac Hollander McCreery 63bc42c872 Mark Volumes and PersistentVolumes as [Feature:Volumes] 2016-01-14 14:07:33 -08:00
Prashanth B 926b94fefc Merge pull request #19493 from bprashanth/kubelet_fix 
Errors in network setup should prevent pod creation
 2016-01-14 13:49:19 -08:00
Yu-Ju Hong 15950daa7f Restore the old behavior of setting pod status to pending 2016-01-14 13:46:26 -08:00
Mike Danese c446bf508e Merge pull request #19431 from spiffxp/docker-machine-rm-hardcode 
Allow for use of docker-machine not named kube-dev
 2016-01-14 13:46:10 -08:00
Mike Danese 1f0b10bd22 Merge pull request #19538 from mesosphere/jdef_mesos_026_compat 
MESOS: compatibility w/ mesos v0.26
 2016-01-14 13:44:42 -08:00
Random-Liu fed61731f1 Fix bug in needsReconcile 2016-01-14 13:44:02 -08:00
Mike Danese 87bce64014 Merge pull request #19607 from hongchaodeng/fix 
typo fix in watch_cache.go
 2016-01-14 13:42:18 -08:00
Mike Danese 1acfb151b6 Merge pull request #19433 from janetkuo/deployment-e2e-flake-fix 
Fix flaky e2e: Use expectation model for deployment's new rc creation
 2016-01-14 13:23:46 -08:00
Mike Danese 742238800d Merge pull request #19418 from bharaththiruveedula/master 
Add kubernetes to .gitignore
 2016-01-14 13:20:50 -08:00
Isaac Hollander McCreery f6fe6949d5 Merge pull request #19505 from ihmccreery/label-documentation 
Add documentation for labels
 2016-01-14 13:11:31 -08:00
Chao Xu b8be5e1340 generate client for scale, which has only the expansion interface 2016-01-14 12:14:00 -08:00
Chao Xu 00b18446ac allow client-gen genereate typed client with only expansion methods 2016-01-14 12:13:01 -08:00
Mike Danese f9f4b74a29 Merge pull request #19449 from hongchaodeng/fitport 
PodFitsHostPorts: small refactor and speedup
 2016-01-14 11:56:14 -08:00
Mike Danese 41df8749a8 Merge pull request #19470 from gmarek/kubemark-performance 
Shorten the sleep amount in the fake docker client
 2016-01-14 11:55:24 -08:00
Mike Danese 4c771b4296 Merge pull request #19613 from swagiaal/improve-rbd-errors 
RBD return output in error case
 2016-01-14 11:52:47 -08:00
Mike Danese b3d035e16f Merge pull request #19278 from philips/minor-edits-to-apiserver-watch-scaling 
docs: apiserver-watch: minor cleanups
 2016-01-14 11:51:48 -08:00
Mike Danese 5b270551a9 Merge pull request #19378 from ihmccreery/remove-update-jobs 
Remove old gce-upgrade jobs
 2016-01-14 11:51:26 -08:00
Mike Danese e253b54d40 Merge pull request #19568 from caesarxuchao/namespace-clientgen 
client-gen: add a nonNamespaced comment tag
 2016-01-14 11:49:36 -08:00