Commit Graph

24644 Commits

Author SHA1 Message Date
Daniel Smith
75c1dcaacd Merge pull request #20463 from andyzheng0831/trusty-master
Support master on Ubuntu Trusty
2016-02-05 15:49:28 -08:00
Daniel Smith
f973af25fa Merge pull request #20747 from caesarxuchao/internalclientset
rename release_1_2 to internalclientset
2016-02-05 15:49:08 -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
Jordan Liggitt
1a92b8d11d Improve serviceaccount e2e setup 2016-02-05 17:39:38 -05:00
k8s-merge-robot
5066e507ae Merge pull request #20194 from derekwaynecarr/fix_hack_test_cmd
Auto commit by PR queue bot
2016-02-05 14:39:00 -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
Daniel Smith
1c7b5e126a Merge pull request #20609 from erictune/add-api-package
Cleanup borrowed conversion functions.
2016-02-05 14:02:30 -08:00
Chao Xu
184440f8ef rename release_1_2 to internalclientset 2016-02-05 14:02:28 -08:00
Daniel Smith
75e1451363 Merge pull request #20742 from kubernetes/revert-20615-deprecate-hostconfig-at-container-start
Revert "Deprecate HostConfig at container start"
2016-02-05 14:01:43 -08:00
Daniel Smith
b278c6acd9 Merge pull request #20565 from kubernetes/revert-20000-disable-flaky
Revert "Disable flaky test."
2016-02-05 14:01:07 -08:00
k8s-merge-robot
b4c16ef9eb Merge pull request #20205 from Random-Liu/remove-old-convert-function-and-reason-cache
Auto commit by PR queue bot
2016-02-05 13:15:36 -08:00
Nikhil Jindal
4606d1408b Merge pull request #20532 from nikhiljindal/genericServerAPIs
Moving /apis handler to generic api server
2016-02-05 13:13:57 -08:00
Paul Morie
0b82d0b491 Allow pod.Spec.ActiveDeadlineSeconds to be updateable 2016-02-05 15:58:31 -05:00
Lantao Liu
bb9457e7a3 Revert "Deprecate HostConfig at container start" 2016-02-05 12:50:35 -08:00
James DeFelice
457fb0382e relabel NodeAffinity tests with Feature:NodeAffinity 2016-02-05 19:51:56 +00:00
deads2k
49529a0aa5 clear env var check for unit test 2016-02-05 14:21:49 -05:00
Random-Liu
45e3a1f596 Remove old reason cache 2016-02-05 19:19:46 +00:00
Random-Liu
2b7d0182ca Remove ConvertPodStatusToAPIPodStatus from runtime interface 2016-02-05 19:19:46 +00:00
k8s-merge-robot
bd67b8a5db Merge pull request #20192 from Random-Liu/remove-get-api-podstatus
Auto commit by PR queue bot
2016-02-05 11:00:42 -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
deads2k
4175688460 add restmapper Stringer methods for debugging 2016-02-05 12:47:25 -05: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
06060d4d77 Merge pull request #20716 from gmarek/master
Auto commit by PR queue bot
2016-02-05 08:53:32 -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
Marek Grabowski
faa0fc3d8c Merge pull request #20720 from gmarek/api-reference
Fix generated api-reference-docs
2016-02-05 16:58:36 +01:00
gmarek
90ddf533f5 Fix generated api-reference-docs 2016-02-05 16:56:51 +01:00
gmarek
432d04149b Run enormous-startup suite in us-east1-b zone 2016-02-05 16:52:15 +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
Marek Grabowski
e8f341cb40 Merge pull request #20650 from mwielgus/heapster-alpha4
Bump heapster from v0.20.0-alpha3 to v.0.20.0-alpha4
2016-02-05 16:04:41 +01: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
Marcin Wielgus
6c2b338af0 Bump heapster from v0.20.0-alpha3 to v.0.20.0-alpha4 2016-02-05 15:33:09 +01:00
Chris Kühl
f62cffa11e docs: make CoreOS casing consistent 2016-02-05 14:49:21 +01: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
Eric Tune
ff35d97663 Cleanup borrowed conversion functions.
In pkg/apis/extensions/v1beta1/conversion.go,
some conversion code was copied from the
legacy api because Pod conversions cannot be
automatically generated because of something
about deprecatedServiceAccount.

This PR fixes two problems due to that copying.

First, the copied code could drift from its source
To fix that, I replaced the Convert_api_ and Convert_v1
implementations with a call to the original function.
I left a wrapper in case something needed to have
a package-local function name.

Second, the copied Convert_* functions, were copied,
in a way that they refer to other conversion functions
that aren't in the current package.  This prevented
genconverion from working from a clean start
(no conversion_generated.go).  Perhaps the person
who wrote this in the first place had copied
the conversion_generated.go file from legacy,
so it worked.   So, I added the v1
package name to calls to Convert_* functions.
So, when someone Cargo-Cult copies the conversion.go
file, like I did, they now will not have to
wonder why genconversion complains about missing
Convert_ functions.

Deleted the conversion_generated.go and reran genconversion
and it worked, no diffs old vs new conversion_generated.go.
2016-02-05 05:42:47 -08:00
Paul Weil
367b307dde design 2016-02-05 08:42:04 -05:00
k8s-merge-robot
4ecfe4d207 Merge pull request #20678 from janetkuo/dont-copy-apply-annotation
Auto commit by PR queue bot
2016-02-05 05:23:08 -08:00
k8s-merge-robot
df0bbd45d7 Merge pull request #20615 from Random-Liu/deprecate-hostconfig-at-container-start
Auto commit by PR queue bot
2016-02-05 04:54:28 -08: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
k8s-merge-robot
6485584fca Merge pull request #20702 from gmarek/controllers
Auto commit by PR queue bot
2016-02-05 04:25:21 -08:00
k8s-merge-robot
9d7a3ed9f6 Merge pull request #20563 from roberthbailey/ui-e2e-non-conformance
Auto commit by PR queue bot
2016-02-05 03:56:43 -08: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
Marcin Wielgus
9a74a60413 Validation of HPA custom metrics annotation 2016-02-05 11:31:51 +01:00
k8s-merge-robot
ce6fd46637 Merge pull request #20539 from mikedanese/kube-scheduler-external
Auto commit by PR queue bot
2016-02-05 01:56:43 -08:00