scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-29 12:53:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,256 Commits 1 Branch 0 Tags
725a8e8b360e72fb2857fc9869b51a1a40fb11b3
Commit Graph

10621 Commits

Author SHA1 Message Date
k8s-merge-robot
725a8e8b36 Merge pull request #21369 from AdoHe/kubectl_change_column_titles 
Auto commit by PR queue bot
 2016-02-23 05:20:38 -08:00
k8s-merge-robot
d3661414a1 Merge pull request #21273 from kargakis/rolling-updater-fix 
Auto commit by PR queue bot
 2016-02-23 04:50:59 -08:00
k8s-merge-robot
9470a7e61c Merge pull request #21627 from justinsb/fix_11324 
Auto commit by PR queue bot
 2016-02-23 03:45:10 -08:00
k8s-merge-robot
6b649d7f9f Merge pull request #21706 from liggitt/token-controller 
Auto commit by PR queue bot
 2016-02-23 02:40:26 -08:00
k8s-merge-robot
3a12b03710 Merge pull request #21448 from timstclair/worker-race 
Auto commit by PR queue bot
 2016-02-23 00:49:28 -08:00
k8s-merge-robot
2acae62709 Merge pull request #21683 from justinsb/fix_20912 
Auto commit by PR queue bot
 2016-02-22 23:45:45 -08:00
k8s-merge-robot
0afbc71f31 Merge pull request #21030 from janetkuo/deployment-label-adopted 
Auto commit by PR queue bot
 2016-02-22 23:45:42 -08:00
Dawn Chen
699c80b752 Merge pull request #21641 from bprashanth/promisc 
Teach the kubelet about promiscuous mode, take 2
 2016-02-22 15:08:18 -08:00
Jordan Liggitt
92bf353496 Ensure created service account tokens are available to the token controller 2016-02-22 16:22:51 -05:00
Janet Kuo
4699a6d8a2 Address comments; fix test failure 2016-02-22 10:58:54 -08:00
Janet Kuo
dc78af948e Address comments; fix incorrect hash 2016-02-22 10:58:54 -08:00
Janet Kuo
0e5da8460d Address comments 2016-02-22 10:58:54 -08:00
Janet Kuo
14bab2bb3a Address comments 2016-02-22 10:58:54 -08:00
Janet Kuo
11fdbff97f Address comments; fix test failures; add e2e tests; update RS's label too 2016-02-22 10:58:54 -08:00
Janet Kuo
da58172283 Ensure Deployment labels adopted ReplicaSets and pods 2016-02-22 10:58:54 -08:00
Tim St. Clair
15d44d182a Fix possible data race in prober 2016-02-22 10:27:57 -08:00
k8s-merge-robot
11cdc919f5 Merge pull request #21364 from pwittrock/macdu 
Auto commit by PR queue bot
 2016-02-22 10:09:03 -08:00
k8s-merge-robot
9b9b4fee11 Merge pull request #21278 from pweil-/include-discovery 
Auto commit by PR queue bot
 2016-02-22 09:31:53 -08:00
k8s-merge-robot
95354490c1 Merge pull request #21318 from kargakis/record-command-factory-method-tweak 
Auto commit by PR queue bot
 2016-02-22 08:11:57 -08:00
k8s-merge-robot
90d1276507 Merge pull request #21223 from hongchaodeng/fix 
Auto commit by PR queue bot
 2016-02-22 07:41:45 -08:00
Justin Santa Barbara
7e69426b8b AWS: Only warn about nameless instances if they are running 
Otherwise this is just confusing logspam.

Fix #20912
 2016-02-22 10:27:13 -05:00
k8s-merge-robot
c533ae4dd0 Merge pull request #21667 from HaiyangDING/patch-3 
Auto commit by PR queue bot
 2016-02-22 06:52:02 -08:00
Wojciech Tyczynski
93a0eac476 Revert "kubelet: fix duplicated status updates at pod cleanup" 2016-02-22 14:27:49 +01:00
k8s-merge-robot
9b9d63ac5e Merge pull request #21340 from liggitt/delete-collection-not-found 
Auto commit by PR queue bot
 2016-02-22 03:37:42 -08:00
k8s-merge-robot
6716344d24 Merge pull request #21438 from yujuhong/terminated_pods 
Auto commit by PR queue bot
 2016-02-22 03:05:01 -08:00
k8s-merge-robot
c44c63c20e Merge pull request #21606 from lavalamp/fix-cache-lock 
Auto commit by PR queue bot
 2016-02-22 02:03:41 -08:00
k8s-merge-robot
aee2eb3977 Merge pull request #21434 from erictune/job-ga 
Auto commit by PR queue bot
 2016-02-22 00:12:54 -08:00
dingh
40f6032d33 fix typo in test 2016-02-22 15:08:02 +08:00
k8s-merge-robot
24d82b6c4a Merge pull request #21286 from smarterclayton/fix_keyring 
Auto commit by PR queue bot
 2016-02-21 21:44:27 -08:00
k8s-merge-robot
84891cabad Merge pull request #19335 from justinsb/aws_delay_when_requestlimitexceeded 
Auto commit by PR queue bot
 2016-02-21 18:38:18 -08:00
Justin Santa Barbara
f8af47b645 AWS: Pass globals into Backoff struct 
Thanks for the suggestion bprashanth!
 2016-02-21 20:17:22 -05:00
k8s-merge-robot
2e3053a204 Merge pull request #21431 from freehan/sourcerange 
Auto commit by PR queue bot
 2016-02-21 16:14:42 -08:00
Prashanth Balasubramanian
c97e8df65b Stricter checking of HAIRPIN_FLAG in salt. 2016-02-21 14:43:43 -08:00
Justin Santa Barbara
b269e8f43c AWS: Delay all AWS calls when we observe RequestLimitExceeded errors 
This applies a cross-request time delay when we observe
RequestLimitExceeded errors, unlike the default library behaviour which
only applies a *per-request* backoff.

Issue #12121
 2016-02-21 15:09:42 -05:00
k8s-merge-robot
99c1df19b1 Merge pull request #21377 from wojtek-t/log_if_throttled 
Auto commit by PR queue bot
 2016-02-21 08:09:25 -08:00
k8s-merge-robot
e34a23b289 Merge pull request #21351 from smarterclayton/optional_pod_status 
Auto commit by PR queue bot
 2016-02-21 04:10:19 -08:00
k8s-merge-robot
12383dfa0c Merge pull request #21341 from smarterclayton/liveness_describer 
Auto commit by PR queue bot
 2016-02-20 23:31:22 -08:00
Prashanth Balasubramanian
2e8ff81de1 Teach the kubelet about --hairpin-mode=promiscuous-bridge. 2016-02-20 22:40:54 -08:00
k8s-merge-robot
65b5d0cbf4 Merge pull request #21269 from gmarek/metrics-grabber 
Auto commit by PR queue bot
 2016-02-20 16:37:16 -08:00
k8s-merge-robot
a52eb5d433 Merge pull request #21268 from jsafrane/devel/recycle-provisioned 
Auto commit by PR queue bot
 2016-02-20 15:26:28 -08:00
k8s-merge-robot
3efdc1e08b Merge pull request #21266 from deads2k/only-load-kubeconfig-once 
Auto commit by PR queue bot
 2016-02-20 14:00:38 -08:00
Justin Santa Barbara
22d719018a AWS: Recover if tags missing on security group 
In the AWS API (generally) we tag things we create, and then we filter
to find them.  However, creation & tagging are typically two separate
calls.  So there is a chance that we will create an object, but fail to
tag it.

We fix this (done here in the case of security groups, but we can do
this more generally) by retrieving the resource without a tag filter.
If the retrieved resource has the correct tags, great.  If it has the
tags for another cluster, that's a problem, and we raise an error.  If
it has no tags at all, we add the tags.

This only works where the resource is uniquely named (or we can
otherwise retrieve it uniquely).  For security groups, the SG name comes
from the service UUID, so that's unique.

Fixes #11324
 2016-02-20 14:58:19 -05:00
k8s-merge-robot
807344da0b Merge pull request #21235 from davidopp/affinity-docs 
Auto commit by PR queue bot
 2016-02-20 11:15:02 -08:00
k8s-merge-robot
be9dfcaec4 Merge pull request #21210 from mqliang/hasSync-early 
Auto commit by PR queue bot
 2016-02-20 09:54:12 -08:00
k8s-merge-robot
330f484c17 Merge pull request #21174 from deads2k/make-patch-more-predictable 
Auto commit by PR queue bot
 2016-02-20 05:56:41 -08:00
k8s-merge-robot
a6d855bf64 Merge pull request #21149 from mwielgus/hpa-rescale 
Auto commit by PR queue bot
 2016-02-20 01:51:08 -08:00
k8s-merge-robot
81366c85c7 Merge pull request #21009 from caesarxuchao/unversioned-discovery 
Auto commit by PR queue bot
 2016-02-20 01:23:29 -08:00
k8s-merge-robot
f08a8f23c1 Merge pull request #20959 from justinsb/fix_20911 
Auto commit by PR queue bot
 2016-02-20 00:56:53 -08:00
Daniel Smith
a8b943dddd Revert "Put the container bridge in promiscuous mode." 2016-02-19 23:14:53 -08:00
Brian Grant
9a12c0a5ea Merge pull request #21598 from janetkuo/log-available-pods 
Log pods of RS when deployment e2e test fails
 2016-02-19 19:18:48 -08:00