github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-31 05:40:42 +00:00
Code Issues Projects Releases Wiki Activity
31,459 Commits 42 Branches 8,159 Tags
ac75bd11cfd9ca927b38b51e08a55d626e5a3131
Commit Graph

1177 Commits

Author SHA1 Message Date
Lucas Käldström
75e8c3f180 Update docker and docker-multinode docs on master to require 1.2.x and use the hyperkube-arch image 2016-01-29 23:01:49 +02:00
k8s-merge-robot
259193dfbb Merge pull request #19772 from joshix/patch-1 
Auto commit by PR queue bot
 2016-01-28 20:16:58 -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
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
Alex Robinson
6acf297231 Update the fluentd versions to include fixes for #19405. 2016-01-27 00:30:53 +00: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
Alex Robinson
c9471a1665 Fix broken link to logging sidecar example. 2016-01-24 17:22:35 -08:00
Dhawal Yogesh Bhanushali
f7db2c6e99 vsphere support 2016-01-24 13:52:56 -08:00
Arsen Mamikonyan
8b5e9e2885 Change repository references to https://github.com/kubernetes/kubernetes 2016-01-22 10:23:14 -05:00
Josh Wood
3d83686857 docs/getting-started/rkt: Clarify flannel prerequisites: need flannel + another etcd 2016-01-20 23:12:13 -08:00
k8s-merge-robot
4e04a289d8 Merge pull request #19793 from MikeSpreitzer/issue/19221 
Auto commit by PR queue bot
 2016-01-20 18:52:56 -08:00
Josh Wood
54a416fcc1 docs/getting-started/rkt: Add default route to k8s_cluster.conf example 2016-01-20 17:25:50 -08:00
k8s-merge-robot
5b5065c525 Merge pull request #19558 from idvoretskyi/patch-6 
Auto commit by PR queue bot
 2016-01-20 16:26:34 -08:00
Josh Wood
d6d2f6f203 docs/getting-started/rkt: Correct spelling error 2016-01-20 02:10:40 -08:00
Josh Wood
75fcbbf2c6 docs/getting-started/rkt: Improve sans flannel example 2016-01-20 02:06:54 -08:00
k8s-merge-robot
b80ed11cc2 Merge pull request #15998 from cilium-team/updating-vagrant 
Auto commit by PR queue bot
 2016-01-19 17:13:03 -08:00
André Martins
0515b4c7c9 Updated Vagrant VMs to Fedora 23 
Signed-off-by: André Martins <aanm90@gmail.com>
 2016-01-19 16:52:54 +00:00
Mike Spreitzer
bf671f5723 Fix reference to kubernetes release 
Replace old repo name with https://github.com/kubernetes/kubernetes.
Update default release to the latest, which is 1.1.4.
 2016-01-18 23:54:36 -05:00
Tim Hockin
1a5bd79dc3 Merge pull request #15353 from tpounds/cleanup-scratch-doc-formatting 
Minor documentation formatting cleanup.
 2016-01-17 23:46:08 -08:00
Josh Wood
bb6bb9f18e docs/getting-started/rkt/: Add and tune rkt network setup info 
Add info about rkt CNI networking setup to README.

Supersedes https://github.com/kubernetes/kubernetes/pull/19745.
 2016-01-17 11:57:16 -08:00
Yifan Gu
e6c4234bd2 docs: Add more info about the networking setup for rkt. 2016-01-15 17:41:53 -08:00
Nan Xiao
59df63d8a7 Update mesos.md 
#18954 should also be merged into master branch.
 2016-01-15 10:27:02 +08:00
Mike Spreitzer
d4ab9663c4 Introduce FLANNEL_OTHER_NET_CONFIG 
.. so allow configuration of other fields in, usually,
/coreos.com/network/config in etcd.

Fixes #19618
 2016-01-14 01:27:13 -05:00
Ihor Dvoretskyi
96d0945dcc Libvirt starting commands 
Libvirt starting commands for systemd and init.d added.
 2016-01-12 21:35:25 +02:00
k8s-merge-robot
d246ed00fa Merge pull request #18894 from luxas/update_master_multi 
Auto commit by PR queue bot
 2016-01-11 20:38:41 -08:00
Lucas Käldström
7d497441b3 Update docker-multinode instructions and version. Also run kube-proxy in a pod in the docker-multnode manifest 2016-01-11 16:45:56 +02:00
k8s-merge-robot
a8d372e78d Merge pull request #19205 from mikedanese/move-locally 
Auto commit by PR queue bot
 2016-01-07 12:11:44 -08:00
Mike Danese
af392926e5 docs: move local getting started guide to docs/devel/ 
Signed-off-by: Mike Danese <mikedanese@google.com>
 2016-01-05 10:28:35 -08:00
k8s-merge-robot
071fd28442 Merge pull request #19272 from cmluciano/cmluciano-cml/dockermachine 
Auto commit by PR queue bot
 2016-01-04 19:06:35 -08:00
Christopher M. Luciano
2af2e72659 Replace boot2docker references with docker-machine 2016-01-04 10:51:38 -05:00
Yifan Gu
0baf4ba188 docs/rkt: Update the docs to reflect the requirement of rkt api service. 2015-12-23 13:58:03 -08:00
Brendan Burns
4ca66d2aef Merge pull request #18047 from caesarxuchao/munger-tag-new 
Stop munger produce the link to a release version doc if it doesn't exit in the release branch
 2015-12-22 10:35:20 -08:00
Ed Costello
f968c593e3 Copy edits for typos 2015-12-22 09:30:48 -05:00
Chao Xu
2b2f285777 run hack/update-generated-docs.sh 2015-12-21 10:41:30 -08:00
Lucas Käldström
6ab098ec56 Add the default dns options to kubelet when running inside docker and document it 2015-12-19 17:36:36 +02:00
Minhan Xia
2c9ffc1b45 Merge pull request #18448 from freehan/eslogging 
add validation for fluentd pods
 2015-12-15 13:25:21 -08:00
k8s-merge-robot
99c8879ef4 Merge pull request #18330 from resouer/my-dev 
Auto commit by PR queue bot
 2015-12-15 05:39:13 -08:00
Filip Grzadkowski
7256b832ff Fix table of contents in docker.md 2015-12-15 11:15:26 +01:00
Minhan Xia
f0c176dd6a add validation for fluentd pods 2015-12-14 16:23:11 -08:00
k8s-merge-robot
e72e819395 Merge pull request #18090 from thockin/go-versions 
Auto commit by PR queue bot
 2015-12-14 14:47:59 -08:00
k8s-merge-robot
03d9f1b85a Merge pull request #18561 from ZJU-SEL/configurable-config-file 
Auto commit by PR queue bot
 2015-12-14 13:56:54 -08:00
Filip Grzadkowski
f2d56c4198 Simplify local docker setup. 2015-12-11 15:53:44 +01:00
k8s-merge-robot
abf9a90030 Merge pull request #17848 from sdminonne/libvirt_service_account 
Auto commit by PR queue bot
 2015-12-11 00:59:23 -08:00
He Simei
1571edfb94 propagate config file 2015-12-11 16:50:05 +08:00
k8s-merge-robot
4a22f2f5f5 Merge pull request #18177 from eosrei/1111-doc-machine-names 
Auto commit by PR queue bot
 2015-12-10 21:42:08 -08:00
Tim Hockin
0df07424e7 Make go version requirements clearer 2015-12-10 12:09:25 -08:00
k8s-merge-robot
7e4084c9cd Merge pull request #18510 from fgrzadkowski/docker_macosx 
Auto commit by PR queue bot
 2015-12-10 11:18:06 -08:00
k8s-merge-robot
c26a76d0ba Merge pull request #18430 from fgrzadkowski/simpler_prerequisites 
Auto commit by PR queue bot
 2015-12-10 11:16:52 -08:00
k8s-merge-robot
0f399211f7 Merge pull request #18258 from antoineco/ec2 
Auto commit by PR queue bot
 2015-12-10 11:14:49 -08:00
Filip Grzadkowski
3a311ec030 Add additional comment for mac users for getting started guide 2015-12-10 15:38:55 +01:00