Commit Graph

3732 Commits

Author SHA1 Message Date
k8s-merge-robot
6834ee59d9 Merge pull request #19795 from caseydavenport/calico-cni-coreos-doc
Auto commit by PR queue bot
2016-02-08 12:04:48 -08:00
k8s-merge-robot
468d0db8f7 Merge pull request #20797 from pmorie/secret-docs
Auto commit by PR queue bot
2016-02-08 11:30:04 -08:00
Casey D
964dfa1ad4 Update Calico CoreOS doc to use CNI plugin, conformance. 2016-02-08 10:58:59 -08:00
k8s-merge-robot
b32078d89b Merge pull request #20496 from matthewdupre/masquerade-config
Auto commit by PR queue bot
2016-02-08 10:49:20 -08:00
Paul Weil
619ccb7023 don't enable psp by default and fix comment 2016-02-08 08:56:52 -05:00
Matt Dupre
9925cddc11 Change iptables fwmark to use single configurable bit instead of whole mark space 2016-02-08 11:12:09 +00:00
k8s-merge-robot
fe8b872779 Merge pull request #20717 from rutsky/patch-1
Auto commit by PR queue bot
2016-02-08 02:02:34 -08:00
k8s-merge-robot
e41329a6db Merge pull request #20216 from KurtStam/master
Auto commit by PR queue bot
2016-02-08 01:46:03 -08:00
k8s-merge-robot
47437163ae Merge pull request #20533 from kolyshkin/patch-1
Auto commit by PR queue bot
2016-02-08 00:32:24 -08:00
k8s-merge-robot
0ab09296f6 Merge pull request #20585 from erictune/api-unions
Auto commit by PR queue bot
2016-02-07 22:16:13 -08:00
Paul Morie
72e3193578 Streamline secret docs and add env var doc 2016-02-07 15:52:43 -05:00
k8s-merge-robot
bc36f57a68 Merge pull request #20482 from eljefedelrodeodeljefe/doc/azure-subscription-option
Auto commit by PR queue bot
2016-02-07 12:16:30 -08:00
Vladimir Rutsky
3b7fe31b94 remove redundant comma in JSON 2016-02-07 21:27:36 +03:00
Robert Jefe Lindstaedt
aa6d6c2779 doc: azure w/ subscription, cos channel option
doc: azure w/ subscription option

docs: azure getting started -> coreos channel env

doc: AZURE_LOCATION needs quotes
2016-02-07 13:57:48 +01:00
k8s-merge-robot
6a98694b4e Merge pull request #20483 from luxas/remove_restart_always
Auto commit by PR queue bot
2016-02-06 16:43:40 -08:00
k8s-merge-robot
096afac5ca Merge pull request #20354 from ihmccreery/ci_doc
Auto commit by PR queue bot
2016-02-06 16:13:01 -08:00
k8s-merge-robot
a08ac362a9 Merge pull request #19839 from madhusudancs/replicaset-e2e-enable
Auto commit by PR queue bot
2016-02-06 12:54:34 -08:00
k8s-merge-robot
c6a4f8482e Merge pull request #17366 from kargakis/kubectl-conventions
Auto commit by PR queue bot
2016-02-06 11:56:48 -08:00
k8s-merge-robot
d1b7fb3025 Merge pull request #20630 from a-robinson/logparse
Auto commit by PR queue bot
2016-02-06 11:28:08 -08:00
Madhusudan.C.S
48c4173f5f Enable ReplicaSets in e2e tests. 2016-02-06 03:46:17 -08:00
k8s-merge-robot
b45a94bc78 Merge pull request #20765 from janetkuo/remove-podtemplate-key
Auto commit by PR queue bot
2016-02-06 00:44:47 -08:00
k8s-merge-robot
fe269474ca Merge pull request #20330 from bryk/kubernetes-dashboard
Auto commit by PR queue bot
2016-02-06 00:15:10 -08:00
k8s-merge-robot
6c5540baae Merge pull request #20232 from mml/daemonset-warn
Auto commit by PR queue bot
2016-02-05 23:12:51 -08:00
k8s-merge-robot
474795060c Merge pull request #19806 from madhusudancs/replicaset-link-boilerplate
Auto commit by PR queue bot
2016-02-05 22:45:13 -08:00
Janet Kuo
38ae5785dc Update docs for removing UniqueLabelKey from deployment spec 2016-02-05 21:21:41 -08:00
Madhusudan.C.S
4f9b8b2bfc Link all the ReplicaSet controller boilerplate together.
1. Enable replica set in controller manager.
2. Enable replica set etcd storage in master package.
3. Add replica set support to kubectl commands.
2016-02-05 21:05:10 -08:00
k8s-merge-robot
8e56494ec5 Merge pull request #20140 from resouer/scheduler
Auto commit by PR queue bot
2016-02-05 20:08:31 -08:00
Kurt Stam
4e2c82fcb1 service discovery proposal using kubernetes service annotations 2016-02-05 21:38:17 -05:00
k8s-merge-robot
fcf9c4a1e4 Merge pull request #19741 from pwittrock/syncfsmetrics
Auto commit by PR queue bot
2016-02-05 17:54:22 -08:00
Mike Danese
b1743a6887 this is a manual reversion of #20702
I can't revert with github which says "Sorry, this pull request couldn’t be
reverted automatically. It may have already been reverted, or the content may
have changed since it was merged."

Reverts commit: 0c191e787b
2016-02-05 16:34:02 -08:00
Phillip Wittrock
3de94cd23c Supply volume fs metrics to server/stats/handler.go
* Metrics will not be expose until they are hooked up to a handler
* Metrics are not cached and expose a dos vector, this must be fixed before release or the stats should not be exposed through an api endpoint
2016-02-05 16:00:24 -08:00
k8s-merge-robot
6b20879a7f Merge pull request #20142 from bprashanth/ing_tls
Auto commit by PR queue bot
2016-02-05 15:07:09 -08:00
Daniel Smith
9441721fee Merge pull request #19689 from AdoHe/kubectl_label_display
kubectl add show-labels flag to make it more readable
2016-02-05 14:08:37 -08:00
Prashanth Balasubramanian
c56bebf594 Basic TLS support. 2016-02-05 11:00:04 -08:00
k8s-merge-robot
87fbfdc953 Merge pull request #20116 from Clarifai/http-headers
Auto commit by PR queue bot
2016-02-05 10:28:31 -08:00
k8s-merge-robot
14d74a1c01 Merge pull request #19365 from jsafrane/devel/retry-delete
Auto commit by PR queue bot
2016-02-05 09:55:21 -08:00
k8s-merge-robot
175d0c57f2 Merge pull request #19880 from DirectXMan12/feature/limit-ebs-scheduler-predicate
Auto commit by PR queue bot
2016-02-05 09:26:42 -08:00
k8s-merge-robot
266d7aa5b3 Merge pull request #19783 from magicwang-cn/master
Auto commit by PR queue bot
2016-02-05 08:53:30 -08:00
Rudi Chiarito
a2d1bb7acf Add httpHeaders to httpGet liveness probe
Also update existing documentation and try to steer users away from 'host'.
Add validation.
2016-02-05 11:20:04 -05:00
Jan Safranek
76b6449715 Retry recycle or delete operation on failure.
Recycle controller tries to recycle or delete a PV several times.
It stores count of failed attempts and timestamp of the last attempt in
annotations of the PV.

By default, the controller tries to recycle/delete a PV 3 times in
10 minutes interval. These values are configurable by
kube-controller-manager --pv-recycler-maximum-retry=X --pvclaimbinder-sync-period=Y
arguments.
2016-02-05 17:02:13 +01:00
gmarek
90ddf533f5 Fix generated api-reference-docs 2016-02-05 16:56:51 +01:00
k8s-merge-robot
3cfb090939 Merge pull request #7893 from pweil-/security-policy
Auto commit by PR queue bot
2016-02-05 07:14:37 -08:00
Vladimir Rutsky
fa37bff9de fix list enumeration
Right now list items are rendered as "1.", "1." instead of "1.", "2.", see
http://kubernetes.io/v1.1/docs/user-guide/walkthrough/README.html#volumes
2016-02-05 18:05:58 +03:00
k8s-merge-robot
ae15a4437b Merge pull request #19944 from mwielgus/simple-cm
Auto commit by PR queue bot
2016-02-05 06:41:28 -08:00
dobbymoodge
c22f348f86 SCC proposal edits for clarity and correctness
This commit fixes a few typographical and wording nits, adds formatting
for keywords where appropriate, and tweaks punctuation for clarity
2016-02-05 08:45:50 -05:00
Paul Weil
03261146b0 api 2016-02-05 08:45:50 -05:00
Paul Weil
367b307dde design 2016-02-05 08:42:04 -05:00
bryk
46f51d74bb Set kubernetes-dashboard as the default UI addon
Dashboard release info:
https://github.com/kubernetes/dashboard/releases/tag/v0.1.0

This replaces kube-ui addon
2016-02-05 13:36:37 +01:00
gmarek
0c191e787b Split controller flags between controllers 2016-02-05 12:17:51 +01:00
Marcin Wielgus
bf0c881263 Set Docker custom metric label for cAdvisor if custom metric volume is mounted 2016-02-05 12:00:02 +01:00