Commit Graph

960 Commits

Author SHA1 Message Date
Brendan Burns
bd0ee98538 Add some more clarity around "controversial" or "complex" PRs and merging. 2015-04-02 12:05:49 -07:00
Eric Tune
3025fa8708 Merge pull request #6151 from AntonioMeireles/add_pointer_to_docs
adding to docs pointers to my personal take on k8s on top of CoreOS and Vagrant
2015-04-02 09:15:36 -07:00
Eric Tune
294b71d2af Merge pull request #6138 from bronislav/update-aws-template
A few update AWS template
2015-04-02 09:01:58 -07:00
Jerzy Szczepkowski
860257e01f Merge pull request #6050 from piosz/docs
Changed merge policy
2015-04-02 10:09:05 +02:00
Prashanth B
3f2309ad15 Merge pull request #6307 from GoogleCloudPlatform/goltermann-issues-1
Update issues.md with modified priority definitions
2015-04-01 17:13:08 -07:00
goltermann
bdbe3fc980 Update issues.md 2015-04-01 16:37:42 -07:00
Steve Watt
221a63396d Added yum install of etcd 2015-04-01 17:44:12 -05:00
Tim Hockin
4191c94e6b Merge pull request #6313 from krousey/design_doc_fix
Changing the case of API to be consistent with surrounding uses.
2015-04-01 15:11:52 -07:00
Alex Robinson
68ca910c1b Fix the kubectl docs at head. 2015-04-01 21:59:26 +00:00
Kris Rousey
547ee5bb2a Changing the case of API to be consistent with surrounding uses. 2015-04-01 14:49:33 -07:00
Robert Bailey
22d9c67cb7 Merge pull request #6190 from liggitt/client_cert_auth
Add client cert authentication
2015-04-01 14:11:29 -07:00
Derek Carr
2af9b54147 Merge pull request #6259 from zmerlynn/fix_cloud_provider
Eliminate grains.cloud_provider (in preference to grains.cloud) from SaltStack
2015-04-01 17:04:05 -04:00
Vish Kannan
d010b2a34e Merge pull request #5560 from erictune/secrets_doc
Secrets doc
2015-04-01 13:24:19 -07:00
Brian Grant
7450da41f1 Merge pull request #6094 from ddysher/remove-reachability
Remove Reachable Condition
2015-04-01 13:16:47 -07:00
goltermann
a0e78df2d3 Update issues.md
Updating priority definitions - open for discussion if there are other opinions.
2015-04-01 13:00:37 -07:00
Deyuan Deng
6bb9701489 Remove Reachable Condition 2015-04-01 13:56:43 -04:00
Jordan Liggitt
c797a91e36 Add client cert authentication 2015-04-01 13:42:26 -04:00
Zach Loafman
b581320bf7 Eliminate grains.cloud_provider (in preference to grains.cloud) from SaltStack
This variable can be entirely derived from grains.cloud, and it
simplifies the configuration somewhat. (Or someone convince me I'm
wrong. I'm happy to be wrong here.)
2015-04-01 08:32:32 -07:00
Derek Carr
762c449043 Merge pull request #6262 from zmerlynn/rm_master_ip
rm Salt grains.master_ip
2015-04-01 11:10:48 -04:00
Zach Loafman
0806e3bde0 rm Salt grains.master_ip
This appears in the Salt documentation, is set by Vagrant, but has no
consumers. Remove vestigial references.
2015-03-31 17:31:47 -07:00
Victor Marmol
08af9dbe24 Merge pull request #6250 from TamerTas/typo
Fix typo in /docs/design/secrets.md
2015-03-31 15:34:16 -07:00
Tamer Tas
e5f29b915d Fix typo in Secrets design document 2015-04-01 01:18:49 +03:00
Victor Marmol
a78a009877 Merge pull request #6249 from TamerTas/typo
Fix typo in Secrets
2015-03-31 15:14:55 -07:00
Eric Tune
a1c36972a0 Added documentation for Secrets. 2015-03-31 15:02:35 -07:00
Tamer Tas
6c10cf7b98 Fix typo in Secrets 2015-04-01 00:56:20 +03:00
Victor Marmol
f0b3493c26 Merge pull request #6240 from zmerlynn/fix_apiservers
s/apiservers/api_servers/ in Salt
2015-03-31 13:06:09 -07:00
Zach Loafman
6c219885e0 s/apiservers/api_servers/ in Salt
It looks like api_servers finally won this battle. Kill off the
last remaining places passing it, but allow the kubelet Salt to
accept apiservers for a period of time.

(This was bothering my OCD.)
2015-03-31 12:29:46 -07:00
Rohit Jnagal
903fb42a36 Merge pull request #6208 from brendandburns/aws
Shorten up the AWS getting started guide to point to get.k8s.io.
2015-03-31 11:12:47 -07:00
Brendan Burns
fb10fb620f Shorten up the AWS getting started guide to point to get.k8s.io, stop pointing at
an obsolete release.
2015-03-31 10:57:31 -07:00
Victor Marmol
9bbf0b1546 Merge pull request #6100 from pmorie/entrypoint
Add control over container entrypoint
2015-03-31 09:58:40 -07:00
Paul Morie
7628b37d78 Add control over container entrypoint 2015-03-31 12:32:03 -04:00
Victor Marmol
e2dcf29878 Merge pull request #6220 from krousey/minor_doc_fix
Fixing a small grammatical error in the pod states documentation.
2015-03-31 09:22:57 -07:00
Victor Marmol
402c0e36b6 Merge pull request #6206 from huangqg/master
add kubeclient of node.js client library
2015-03-31 08:05:20 -07:00
Victor Marmol
d11189f426 Merge pull request #6192 from wattsteve/patch-2
Add NFS Volume Plugin Info to Docs
2015-03-31 08:04:05 -07:00
Piotr Szczesniak
1d4ccab526 Changed merge policy 2015-03-31 16:54:03 +02:00
huangqg
b10e7a92b1 add kuberclients of node.js client library 2015-03-31 11:45:40 +08:00
Steve Watt
0df63ab0c1 Update volumes.md
Update docs and example for NFS Plugin

Modified the wording around how many Volumes exist

Cleaned up the text around the NFS Pod description

Fixed Spelling mistake on read-only
2015-03-30 20:40:51 -05:00
Kris Rousey
d3312e27f2 Fixing a small grammatical error in the pod states documentation. 2015-03-30 17:08:28 -07:00
Jeff Grafton
fd94fdbe2a Merge pull request #5141 from erictune/gsgrules
Guidelines for Getting Started Guide contributions
2015-03-30 15:35:37 -07:00
Brendan Burns
4659a12d6b Merge pull request #6135 from AntonioMeireles/master
getting 7bc7f47 fully right.
2015-03-30 12:27:28 -07:00
Eric Tune
ebf3134c79 Proposed guidelines for new Getting-started-guides.
# *** ERROR: *** docs are out of sync between cli and markdown
# run hack/run-gendocs.sh > docs/kubectl.md to regenerate

#
# Your commit will be aborted unless you regenerate docs.
    COMMIT_BLOCKED_ON_GENDOCS
2015-03-30 09:52:52 -07:00
António Meireles
5a6069bb27 adding to docs pointers to my personal take on k8s on top of CoreOS and Vagrant.
Signed-off-by: António Meireles <antonio.meireles@reformi.st>
2015-03-30 17:45:34 +01:00
Victor Marmol
4c23a6762d Merge pull request #6101 from ric03uec/fix_admission_control_url
fixing url for admission_control docs
2015-03-30 09:43:34 -07:00
Victor Marmol
a922bf9d2c Merge pull request #6157 from AntonioMeireles/drop_remaining_cadvisor_refs
remove remaining references to containerized cadvisor.
2015-03-30 08:06:53 -07:00
Victor Marmol
58bc479e81 Merge pull request #6149 from ghodss/update-gce-quickstart
Update GCE getting started guide to include gcloud preview
2015-03-30 08:01:16 -07:00
António Meireles
0b793a6c74 remove remaining references to containerized cadvisor.
since GoogleCloudPlatform/kubernetes#5308 got merged cadvisor facilities are
built-in in kubelet, so time to update the 'screenshots'...

Signed-off-by: António Meireles <antonio.meireles@reformi.st>
2015-03-30 15:27:23 +01:00
António Meireles
bb4071e8be getting 7bc7f47 fully right.
given that etcd is disabled in the nodes we need to wait for master's etcd to be
available so that flanneld gets properly wired.

Signed-off-by: António Meireles <antonio.meireles@reformi.st>
2015-03-30 08:33:11 +01:00
Sam Ghods
ef77349306 Update GCE getting started guide to include gcloud preview 2015-03-29 18:37:01 -07:00
Deyuan Deng
f35dc54d62 Fix docs 2015-03-28 23:42:54 -04:00
Anton Ilin
2d01f1f02e Fix indentation and types cf template parameters
Use AWS specific types for key pair name and vpc parts
2015-03-28 18:33:47 +02:00