github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity
24,189 Commits 42 Branches 7,905 Tags 1.3 GiB
8e56494ec5
Commit Graph

24189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
k8s-merge-robot
1eff1d52e2 Merge pull request #20033 from bparees/dockerclient_bump 
Auto commit by PR queue bot
 2016-02-05 19:37:22 -08:00
k8s-merge-robot
58e09b4135 Merge pull request #20621 from vishh/cadvisor-godeps 
Auto commit by PR queue bot
 2016-02-05 19:04:12 -08: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
Vishnu kannan
849f06c51c Updating cadvisor tag to v0.21.1 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-02-05 17:35:08 -08:00
Daniel Smith
da10ef387f Merge pull request #20761 from mikedanese/revert-20702 
this is a manual reversion of #20702
 2016-02-05 17:07:47 -08:00
Daniel Smith
7ec7eb3173 Merge pull request #19803 from madhusudancs/replicaset-registry 
Implement ReplicaSet registry.
 2016-02-05 16:52:17 -08:00
k8s-merge-robot
8163b6ce97 Merge pull request #20671 from vishh/avoid-moving-all-dockers 
Auto commit by PR queue bot
 2016-02-05 16:49:03 -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
Madhusudan.C.S
0bcab9ab11 Implement ReplicaSet registry. 2016-02-05 16:14:10 -08:00
Daniel Smith
8f3eb93626 Merge pull request #20072 from smarterclayton/higher_debug 
Move the loader file log level to v(6)
 2016-02-05 16:03:07 -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
Daniel Smith
60cc5d10b7 Merge pull request #20013 from spxtr/fix-ssh 
Retry SSH connection for E2E log gathering.
 2016-02-05 15:52:34 -08:00
Daniel Smith
9b68e8ec2b Merge pull request #20269 from mqliang/sync-delta-fifo 
add a HasSynced() for DeltaFIFO and FIFO, method, which is very helpful for Informer
 2016-02-05 15:51:50 -08:00
Daniel Smith
5fe99f44c8 Merge pull request #20542 from mikedanese/kube-proxy-defaulting 
componentconfig: move kube proxy defaulting into the exetrnal api
 2016-02-05 15:51:12 -08:00
Daniel Smith
82e928d71b Merge pull request #20636 from deads2k/fix-error 
fix version detection for error
 2016-02-05 15:50:27 -08:00
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
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
Lantao Liu
bb9457e7a3 Revert "Deprecate HostConfig at container start" 2016-02-05 12:50:35 -08: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
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
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
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