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

20247 Commits (241551e36ea0c357f6de71027180276d0e708fb7)

Author SHA1 Message Date
k8s-merge-robot d1345a1f4f Merge pull request #16502 from wojtek-t/list_from_memory 
Auto commit by PR queue bot
 2015-10-30 19:47:10 -07:00
Jeff Lowdermilk ac18c46d07 Test config for gke-1.1 job 2015-10-30 16:42:40 -07:00
Alex Robinson c31a22227d Merge pull request #16345 from jlowdermilk/kubeconfig-kube-up 
Load or generate auth from kubeconfig on kube-up
 2015-10-30 16:36:18 -07:00
Alex Robinson 5d037ef484 Merge pull request #16625 from bprashanth/slb 
Skip serviceloadbalancer e2e on GKE
 2015-10-30 16:35:16 -07:00
Dawn Chen d2805c65d6 Fix Kubelet /logs endpoint 2015-10-30 16:19:34 -07:00
Eric Tune 0bde95f1ce Fix incorrect flag in example. 2015-10-30 15:40:05 -07:00
Alex Robinson 0eb7243b95 Merge pull request #15994 from dchen1107/docker 
Failed docker health check and mark the node NotReady when docker version is below 1.6.2 (API ve…
 2015-10-30 15:39:04 -07:00
Alex Robinson 77f41e8fdd Merge pull request #16620 from mikedanese/etcd-bump 
bump etcd version to 2.2.1 in Makefile
 2015-10-30 15:37:39 -07:00
Alex Robinson bc608deed6 Merge pull request #16622 from ixdy/upload-to-gcs-emptydir 
Only try to upload test artifacts if they really exist
 2015-10-30 15:35:44 -07:00
Prashanth Balasubramanian bf6a414c5f Skip serviceloadbalancer e2e on GKE 2015-10-30 15:14:04 -07:00
Jeff Grafton 623cbb5bd6 Only try to upload artifacts if they really exist. 2015-10-30 14:51:35 -07:00
Mike Danese d90b76aaeb bump etcd version to 2.2.1 in Makefile 2015-10-30 14:34:55 -07:00
Brian Grant a5d7e1f36c Gut out-of-date roadmap in favor of milestones. 2015-10-30 21:26:45 +00:00
k8s-merge-robot e46f7e29c4 Merge pull request #16565 from jlowdermilk/kubekins-test-env 
Auto commit by PR queue bot
 2015-10-30 13:53:30 -07:00
Dawn Chen a39e1e96dc Mark NodeNotReady for docker version below 1.6.2 2015-10-30 13:48:51 -07:00
Dawn Chen b691fd299c Failed docker health check when docker version is below 1.6.2 (API version: 1.18) 2015-10-30 13:48:50 -07:00
Alex Robinson 97275873ff Merge pull request #16591 from kubernetes/revert-15838-issue14500 
Revert "An attempt to fix flake in TestControllerSyncJob (14500)"
 2015-10-30 13:14:05 -07:00
Brian Grant acb0ca18e0 Merge pull request #16608 from nikhiljindal/daemonsetsDocFix 
Fixing instructions on how to enable daemonsets
 2015-10-30 13:02:04 -07:00
Wojciech Tyczynski 652fb090eb Initial support for listing from in-memory cache. 2015-10-30 20:58:13 +01:00
k8s-merge-robot eb140495ab Merge pull request #16414 from Random-Liu/put-podname-into-label 
Auto commit by PR queue bot
 2015-10-30 12:45:25 -07:00
nikhiljindal 72db55eb26 Fixing how to enable daemonsets 2015-10-30 12:28:10 -07:00
k8s-merge-robot a9534bfd33 Merge pull request #16441 from liggitt/helper_codec 
Auto commit by PR queue bot
 2015-10-30 11:29:17 -07:00
Jeff Lowdermilk 39965b67ce Move branch-specific test env out of the kubekins-test image 2015-10-30 11:12:47 -07:00
k8s-merge-robot 9e16b1dec9 Merge pull request #16589 from wojtek-t/list_options_in_clients 
Auto commit by PR queue bot
 2015-10-30 10:58:15 -07:00
Jordan Liggitt 600b5e633d Fix GetRequestInfo subresource parsing for proxy/redirect verbs 2015-10-30 13:41:49 -04:00
Dawn Chen ed190a4653 Merge pull request #16127 from jimmidyson/cadvisor-bump 
Bump cadvisor & libcontainer
 2015-10-30 10:20:36 -07:00
Jeff Lowdermilk de4f29f1f5 Load or generate auth from kubeconfig on kube-up 
Allows loading existing auth from kubeconfig on kube-up if a
valid KUBE_CONTEXT is specified, instead of always force
regenerating auth (basic or token) when creating a new cluster.
 2015-10-30 10:19:40 -07:00
Florian Walker 4face20a19 Updated nginx static html directory. 2015-10-30 17:51:23 +01:00
Alex Robinson 887b9dd78a Merge pull request #16232 from bprashanth/salt 
Cluster-loadbalancing addon
 2015-10-30 09:45:16 -07:00
Alex Robinson 21a75abfbd Merge pull request #16489 from mqliang/deleteFmt 
replace `fmt.Sptintf()` with naive string appending
 2015-10-30 09:25:39 -07:00
Eric Tune a600ac0cca Revert "An attempt to fix flake in TestControllerSyncJob (14500)" 2015-10-30 08:56:11 -07:00
Wojciech Tyczynski aac55d4795 Unify List() signature in clients 2015-10-30 15:43:40 +01:00
k8s-merge-robot cc53619372 Merge pull request #15791 from abutcher/set-service 
Auto commit by PR queue bot
 2015-10-30 06:55:16 -07:00
k8s-merge-robot 36bae67910 Merge pull request #16548 from ArtfulCoder/kube-proxy-mem-use 
Auto commit by PR queue bot
 2015-10-30 06:23:14 -07:00
Wojciech Tyczynski 57a745a404 Merge pull request #16118 from ncdc/bump-spdystream 
bump(github.com/docker/spdystream): 43bffc4
 2015-10-30 13:33:27 +01:00
k8s-merge-robot 8a6020ef62 Merge pull request #16544 from smarterclayton/enable_log_with_tail 
Auto commit by PR queue bot
 2015-10-30 05:03:35 -07:00
k8s-merge-robot 55246db600 Merge pull request #16491 from wojtek-t/merge_to_options_in_storage 
Auto commit by PR queue bot
 2015-10-30 04:30:17 -07:00
Wojciech Tyczynski 4c0e6b160a Merge pull request #16339 from samsabed/backoff-e2e-no-exponential 
remove back-off exponential test and adjust timing
 2015-10-30 10:40:35 +01:00
k8s-merge-robot 536740f38f Merge pull request #16443 from brendandburns/lb2 
Auto commit by PR queue bot
 2015-10-30 02:05:11 -07:00
k8s-merge-robot 2861dbb186 Merge pull request #16023 from rimusz/master 
Auto commit by PR queue bot
 2015-10-30 02:02:22 -07:00
k8s-merge-robot b4171c439e Merge pull request #16498 from zmerlynn/spark-moar 
Auto commit by PR queue bot
 2015-10-30 01:34:39 -07:00
David Oppenheimer 899ddc66eb Merge pull request #16478 from mikedanese/ds-nodeready 
daemonset don't place pods on notready nodes
 2015-10-30 01:07:28 -07:00
k8s-merge-robot bbba223584 Merge pull request #16445 from smarterclayton/improve_errors 
Auto commit by PR queue bot
 2015-10-30 00:17:18 -07:00
k8s-merge-robot a86d8780f8 Merge pull request #16082 from caesarxuchao/discover-1.0-server-new 
Auto commit by PR queue bot
 2015-10-29 23:45:16 -07:00
Lantao Liu b3585a5209 Move docker label related functions into labels.go and add pod name, pod namespace and pod uid into docker label 2015-10-29 22:42:25 -07:00
Brendan Burns 604203595a Fix a bug where nodes that weren't schedulable or ready are added to load balancers 2015-10-29 22:05:08 -07:00
Mike Danese 88008de96b Merge pull request #16459 from mikedanese/enable-exp 
enable deployment and daemonset in gce upgrade tests
 2015-10-29 20:05:20 -07:00
Brian Grant 562963249f Merge pull request #16553 from caesarxuchao/rewrite-build-scripts 
fix versionize-docs.sh and mark-new-version.sh to rewrite links to release branch rather than to tag
 2015-10-29 17:04:20 -07:00
Chao Xu 819cbbefd5 fix versionize-docs.sh and mark-new-version.sh to rewrite links to release branch rather than to tag 2015-10-29 17:02:04 -07:00
Mike Danese d28d1344ae Merge pull request #16533 from ihmccreery/upgrade-test-fixes 
Jenkins upgrade job fixes
 2015-10-29 16:43:11 -07:00