Commit Graph

2690 Commits

Author SHA1 Message Date
k8s-merge-robot
d98f6daff3 Merge pull request #12747 from smarterclayton/pending_deletion_docs
Auto commit by PR queue bot
2015-09-21 19:49:00 -07:00
k8s-merge-robot
c96c76b729 Merge pull request #13780 from smarterclayton/pod_logs
Auto commit by PR queue bot
2015-09-21 17:02:47 -07:00
Clayton Coleman
c2e90cd154 Support extended pod logging options
Increase the supported controls on pod logging. Add validaiton to pod
log options. Ensure the Kubelet is using a consistent, structured way to
process pod log arguments.

Add ?sinceSeconds=<durationInSeconds>, &sinceTime=<RFC3339>, ?timestamps=<bool>,
?tailLines=<number>, and ?limitBytes=<number>
2015-09-21 15:39:32 -04:00
k8s-merge-robot
11c31aeca7 Merge pull request #14252 from thockin/exp_annot_convention
Auto commit by PR queue bot
2015-09-21 10:50:40 -07:00
k8s-merge-robot
843134885e Merge pull request #12470 from simon3z/add-host-ipc
Auto commit by PR queue bot
2015-09-21 09:15:01 -07:00
k8s-merge-robot
9f93dceab1 Merge pull request #14112 from timothysc/e2e-docs
Auto commit by PR queue bot
2015-09-21 07:21:16 -07:00
Tim Hockin
cf1141220f Clarify experimental annotation format 2015-09-20 21:00:41 -07:00
k8s-merge-robot
c2f76e4ce7 Merge pull request #14106 from jszczepkowski/hpa-api
Auto commit by PR queue bot
2015-09-19 22:23:06 -07:00
k8s-merge-robot
83192aac45 Merge pull request #13964 from liguangbo/fix_make_ca_cert_proxy
Auto commit by PR queue bot
2015-09-19 00:15:54 -07:00
Tim Hockin
6def707f9c Merge pull request #12887 from djosborne/master
added calico-kubernetes-fedora-digitalocean demo
2015-09-18 14:43:54 -07:00
Federico Simoncelli
f21d9ac9e4 Support pods with containers using host ipc
Add a HostIPC field to the Pod Spec to create containers sharing
the same ipc of the host.

This feature must be explicitly enabled in apiserver using the
option host-ipc-sources.

Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
2015-09-18 21:13:39 +02:00
Tim Hockin
8e4b09df8f Merge pull request #14077 from nikhiljindal/update-swagger-docs
Updating stale api-reference docs
2015-09-18 09:59:32 -07:00
liguangbo
c907bac6c8 Fix easy-rsa download time out in ubuntu deployment script 2015-09-18 17:37:04 +08:00
k8s-merge-robot
73d71d6a67 Merge pull request #14096 from mvdan/util-duration
Auto commit by PR queue bot
2015-09-18 00:20:43 -07:00
Daniel Martí
586cb9126a Move pkg/util.Time to pkg/api/unversioned.Time
Along with our time.Duration wrapper, as suggested by @lavalamp.
2015-09-17 17:51:27 -07:00
k8s-merge-robot
0fb60482c3 Merge pull request #13848 from jayunit100/kubeconfig-file-description-and-updates
Auto commit by PR queue bot
2015-09-17 17:06:19 -07:00
jay vyas
5ca618f874 Added some clarity to kubeconfig around tokens and how it corresponds to
the apiservers.
2015-09-17 16:18:37 -04:00
k8s-merge-robot
055f5ff9b9 Merge pull request #13649 from markturansky/prov_deleter
Auto commit by PR queue bot
2015-09-17 12:59:45 -07:00
Timothy St. Clair
f958daf67d Add developer documentation on e2e testing. 2015-09-17 14:40:14 -05:00
Clayton Coleman
094640a35c Additional comments 2015-09-17 14:57:20 -04:00
Alex Mohr
959c1a14cf Merge pull request #13750 from jimmycuadra/docs-accessing-the-api
Clarify authentication methods for k8s components
2015-09-17 10:26:58 -07:00
markturansky
c2de9e9647 Added volume.Deleter interface and simple HostPath implementation 2015-09-17 12:08:58 -04:00
k8s-merge-robot
308155d178 Merge pull request #14038 from Huawei-PaaS/fixed_some_typos_in_sharing_clusters_md
Auto commit by PR queue bot
2015-09-17 08:14:42 -07:00
Jerzy Szczepkowski
7fcf7f1177 Cleanups in HorizontalPodAutoscaler API.
Cleanups in HorizontalPodAutoscaler API: renamed Min/MaxCount to Min/MaxReplicas as Replicas is the proper name used in other objects.
2015-09-17 14:16:43 +02:00
k8s-merge-robot
e83bf49f86 Merge pull request #13957 from ghodss/rename-deployment-structs
Auto commit by PR queue bot
2015-09-17 04:23:13 -07:00
k8s-merge-robot
b342591032 Merge pull request #13604 from JanetKuo/kubectl-edit
Auto commit by PR queue bot
2015-09-17 03:00:33 -07:00
k8s-merge-robot
445fde3dc5 Merge pull request #13447 from pweil-/pid-mode
Auto commit by PR queue bot
2015-09-16 23:34:35 -07:00
Alex Mohr
f3308dc918 Merge pull request #13683 from brendandburns/docs4
Add some documentation describing out developer/repository automation.
2015-09-16 21:53:57 -07:00
Alex Mohr
8da538fcd3 Merge pull request #13979 from bgrant0607/docfix2
A couple more naming conventions.
2015-09-16 21:49:46 -07:00
Mike Danese
19421c52e2 Merge pull request #13963 from zhengguoyong/fix-minior-doc
fix the change of minions to nodes
2015-09-16 15:14:10 -07:00
nikhiljindal
e5e5b0af5a Updating stale api-reference docs 2015-09-16 14:34:46 -07:00
k8s-merge-robot
3dcb75c599 Merge pull request #13986 from derekwaynecarr/move_to_flannel
Auto commit by PR queue bot
2015-09-16 09:36:09 -07:00
k8s-merge-robot
26da8d0f24 Merge pull request #10093 from jsafrane/devel/static-pods
Auto commit by PR queue bot
2015-09-16 05:53:46 -07:00
qiaolei
fbaf7d8f81 Fixed some typos in sharing-clusters.md
Fixes are:

1. `.kubeconfig` -> `kubeconfig`
2. `.kubectl` -> `kubectl`
3. `.kubeconfig` -> `.kube/config`
4. `path/to/.kube/config` -> `/path/to/.kube/config`
5. `commandline` -> `command line`
2015-09-16 20:53:05 +08:00
k8s-merge-robot
14ccba8924 Merge pull request #13886 from a-robinson/logtags
Auto commit by PR queue bot
2015-09-16 05:51:32 -07:00
k8s-merge-robot
b85a7c0a6d Merge pull request #13968 from kevin-wangzefeng/fix_a_typo_in_ubuntu_getting_started_guide
Auto commit by PR queue bot
2015-09-16 05:07:19 -07:00
Jerzy Szczepkowski
d549fc400a Merge pull request #14026 from Huawei-PaaS/fix-dead-link-of-logging
fix the dead link of logging.md
2015-09-16 13:06:58 +02:00
yuqi huang
1e2f791f95 fix the dead link of logging.md
fix the dead link of logging.md
2015-09-16 15:49:36 +00:00
k8s-merge-robot
0ef741a557 Merge pull request #14018 from Huawei-PaaS/fix-typos-of-doc
Auto commit by PR queue bot
2015-09-16 02:48:28 -07:00
yuqi huang
d88562d070 fix the syntax error in docs
fix the syntax error in docs
2015-09-16 11:47:02 +08:00
Janet Kuo
5a608446ba pull "kubectl edit" from openshift upstream 2015-09-15 19:16:23 -07:00
zhengguoyong
8602250551 Update vagrant.md 2015-09-16 09:10:47 +08:00
zhengguoyong
6c5e25b71c Update salt.md 2015-09-16 09:10:05 +08:00
zhengguoyong
efef922671 Update salt.md 2015-09-16 09:08:50 +08:00
Jeff Lowdermilk
9f036f2a55 Merge pull request #13954 from ArtfulCoder/externalIPDoc
Documentation for externalIPs
2015-09-15 17:48:11 -07:00
Jeff Lowdermilk
aa801f0dd9 Merge pull request #13950 from tpounds/fix-hosted-etcd-image-doc-links
Fix scratch doc links to hosted etcd images.
2015-09-15 17:43:06 -07:00
Jeff Lowdermilk
ebc0b02b7d Merge pull request #13613 from eparis/rework-doc-generation
Rework automatic doc generation
2015-09-15 17:35:47 -07:00
Alex Robinson
8040f75594 Update fluentd-gcp to use a new google-fluentd build with my recent
changes to fluent-plugin-google-cloud to attach Kubernetes metadata to
logs.

Along with this, separate logs from containers in the cluster out from
logs from the daemons running on the node by instantiating two instances
of the output plugin, one which uses the new metadata (for containers)
and one which doesn't (for things like docker and the kubelet).
2015-09-15 23:14:43 +00:00
Sam Ghods
cc6754f8d9 Rename Deployment API structs 2015-09-15 14:46:41 -07:00
derekwaynecarr
360e7620d3 Move vagrant to flannel 2015-09-15 15:42:38 -04:00