github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
25,976 Commits
31 Branches
881 Tags
634 MiB
Commit Graph

848 Commits (2a4479fa601fb5ccc50676fa1f8c9e1f159ca558)

Author SHA1 Message Date
Chao Xu ad46715f51 generate fake client for release_1_2 2016-02-17 16:10:02 -08:00
laushinka 7ef585be22 Spelling fixes inspired by github.com/client9/misspell 2016-02-18 06:58:05 +07:00
Janet Kuo fe4bf6ff5c When syncRecreateDeployment, don't create a new RS before scaling down 2016-02-16 18:05:44 -08:00
Janet Kuo e9262df456 Scale up early when deployment creates new Replica set 2016-02-16 18:05:44 -08:00
k8s-merge-robot 3616b4bfec Merge pull request #21044 from mqliang/deployment-util 
Auto commit by PR queue bot
 2016-02-16 15:33:26 -08:00
Chao Xu 97aecd002a remove underscore in imported pkg names 2016-02-16 10:54:51 -08:00
k8s-merge-robot 6a1214b017 Merge pull request #21172 from cjcullen/cidralloc 
Auto commit by PR queue bot
 2016-02-16 03:26:23 -08:00
Marcin Wielgus 41cf0cd78f Change custom metrics prefix in HPA metrics client 2016-02-15 20:28:37 +01:00
Jan Safranek 6088369227 Delete provisioned volumes without claim. 
There is a race in dynamic provisioning:

1. User creates a claim to dynamically provision a volume.
2. Kubernetes start provisioning the volume.
3. User deletes the claim before 2. is finished.
4. Kubernetes finished provisioning the volume.

The volume is in Pending state. This volume should be deleted instead of
moving to Available state.
 2016-02-15 16:38:35 +01:00
mqliang fcf0d6d720 add GetValueFromIntOrPercent helper funcs 2016-02-15 23:06:02 +08:00
mqliang d96cdb93c4 move helper funcs to util/deployment.go from util.go 2016-02-15 22:36:48 +08:00
k8s-merge-robot 39a9043b8e Merge pull request #21095 from liggitt/sa-namespace 
Auto commit by PR queue bot
 2016-02-14 22:13:10 -08:00
k8s-merge-robot 81c8494307 Merge pull request #21010 from mikedanese/ds-revert 
Auto commit by PR queue bot
 2016-02-14 07:43:18 -08:00
k8s-merge-robot 315a509340 Merge pull request #20900 from jsafrane/devel/volume-names 
Auto commit by PR queue bot
 2016-02-13 17:58:29 -08:00
k8s-merge-robot 3b4c0beb99 Merge pull request #20868 from mqliang/int-min-max 
Auto commit by PR queue bot
 2016-02-13 17:32:22 -08:00
k8s-merge-robot 524aaa2f7f Merge pull request #21152 from kargakis/fix-cleanup-policy 
Auto commit by PR queue bot
 2016-02-13 03:47:33 -08:00
k8s-merge-robot 15893a48d9 Merge pull request #21091 from janetkuo/sync-pod-deployment 
Auto commit by PR queue bot
 2016-02-12 18:53:37 -08:00
k8s-merge-robot d6b81640ed Merge pull request #21012 from cjcullen/handlertest 
Auto commit by PR queue bot
 2016-02-12 15:00:24 -08:00
CJ Cullen 52b16129dc Re-GET nodes during CIDR allocation (to avoid cascading bad resource version). 2016-02-12 13:08:54 -08:00
Michail Kargakis b9839d0677 controller: fix cleanup policy for deployments 
Cleanup policy should run on all replica sets and not only on those that
have pods (we will not cleanup those anyway).
 2016-02-12 19:14:18 +01:00
Mike Danese 32d844e59c Merge pull request #21036 from mqliang/master-syncStore 
revert #19973
 2016-02-12 10:04:26 -08:00
k8s-merge-robot ad7ed67904 Merge pull request #20213 from jsafrane/devel/pv-reload 
Auto commit by PR queue bot
 2016-02-12 06:49:29 -08:00
k8s-merge-robot 678958a706 Merge pull request #19868 from jsafrane/devel/syncclaim-twice 
Auto commit by PR queue bot
 2016-02-12 06:21:21 -08:00
Jan Safranek 1d0b1c227b Add PV.Name into names of generated GCE/AWS/OSP volumes. 
Volume names have now format <cluster-name>-dynamic-<pv-name>.

pv-name is guaranteed to be unique in Kubernetes cluster, adding
<cluster-name> ensures we don't conflict with any running cluster
in the cloud project (kube-controller-manager --cluster-name=XXX).

'kubernetes' is the default cluster name.
 2016-02-12 09:46:59 +01:00
Janet Kuo 2731e5fe20 Check pod HasSynced in deployment controller manager 2016-02-12 00:11:27 -08:00
mqliang 7be9071584 create some integer min/max function 2016-02-12 11:20:11 +08:00
Mike Danese 23ad84b0c7 place damonset pods on not ready nodes 2016-02-11 13:11:05 -08:00
Jordan Liggitt 20216fa607 Provide current namespace to InClusterConfig 2016-02-11 15:51:31 -05:00
mqliang 4f24ea65f2 delete replicaset when delete namespace 2016-02-12 00:20:10 +08:00
mqliang 91124afdd7 Revert "Sync pods for daemon sets." 
This reverts commit ffd34311c6.
 2016-02-11 11:46:16 +08:00
mqliang d802778c20 Revert "Sync all pods with store before starting RC Manager." 
This reverts commit 1b93ee7b35.
 2016-02-11 11:43:49 +08:00
CJ Cullen 918b0ef479 Don't try to create routes for nodes w/o CIDRs assigned. 2016-02-10 16:23:28 -08:00
k8s-merge-robot 3b41600e5a Merge pull request #20929 from thockin/go-vet 
Auto commit by PR queue bot
 2016-02-10 12:13:55 -08:00
Paul Morie 3a505ac364 Make namespace controller delete configMaps in namespace 2016-02-10 10:52:24 -05:00
k8s-merge-robot 9520bb5ddf Merge pull request #20731 from Clarifai/ensure-lb-servicename 
Auto commit by PR queue bot
 2016-02-10 01:25:07 -08:00
k8s-merge-robot 71b6b81102 Merge pull request #20076 from derekwaynecarr/namespace_controller_workers 
Auto commit by PR queue bot
 2016-02-10 00:55:57 -08:00
k8s-merge-robot 41a98b43e4 Merge pull request #19840 from madhusudancs/replicaset-deployment 
Auto commit by PR queue bot
 2016-02-09 18:57:42 -08:00
k8s-merge-robot 2ec49efd54 Merge pull request #19945 from Clarifai/fix-formatting 
Auto commit by PR queue bot
 2016-02-09 16:05:00 -08:00
derekwaynecarr 106693d9b3 Refactor namespace controller to use workers, do more delete collection calls 2016-02-09 16:39:13 -05:00
Tim Hockin 7cab7bd472 fix a few go-vet errors 2016-02-09 13:20:31 -08:00
Rudi Chiarito 5874b0cb9d Pass namespaced service name to cloudprovider's EnsureLoadBalancer 
Also has an AWS implementation that plugs the service name into the ELB and SG.
Log the service name under GCE and OpenStack.
Fixes #20668
 2016-02-09 06:50:53 -05:00
k8s-merge-robot ea484ecffe Merge pull request #20819 from mwielgus/logging-in-hpa 
Auto commit by PR queue bot
 2016-02-09 01:41:09 -08:00
Madhusudan.C.S ed7ad6dcf3 Make deployments work. 2016-02-08 21:27:49 -08:00
Madhusudan.C.S 518f08aa7c Move Deployments to ReplicaSets and switch the Deployment selector to the new LabelSelector. 
Update the Deployments' API types, defaulting code, conversions, helpers
and validation to use ReplicaSets instead of ReplicationControllers and
LabelSelector instead of map[string]string for selectors.

Also update the Deployment controller, registry, kubectl subcommands,
client listers package and e2e tests to use ReplicaSets and
LabelSelector for Deployments.
 2016-02-08 21:27:38 -08:00
k8s-merge-robot a2c8712aee Merge pull request #20368 from mqliang/cleanup-unhealthy-replicas 
Auto commit by PR queue bot
 2016-02-08 20:18:25 -08:00
mqliang 86aea1d59c clean up unhealthy replicas frst for old rcs when reconcileOldRCs 2016-02-09 07:43:48 +08:00
Marcin Wielgus 67e9db4377 Set verbosity for debug logs 2016-02-08 17:07:05 +01:00
gmarek 6b2507485f Add FakeNeverRateLimitter 2016-02-08 11:06:25 +01:00
Jan Chaloupka 4389b3f0d6 Rewritte util.* -> wait.* wherever reasonable 2016-02-07 12:02:20 +01:00
k8s-merge-robot 59a05682dc Merge pull request #20662 from thockin/e2e-ip-leak 
Auto commit by PR queue bot
 2016-02-06 23:30:56 -08:00
k8s-merge-robot e76caf43aa Merge pull request #20703 from mwielgus/hpa-cm-validation 
Auto commit by PR queue bot
 2016-02-06 21:16:51 -08:00
Tim Hockin 78322091f0 Better logs in service controller 2016-02-06 21:14:20 -08:00
k8s-merge-robot 17c65cee35 Merge pull request #20607 from bprashanth/svccontroller_events 
Auto commit by PR queue bot
 2016-02-06 10:53:27 -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 474795060c Merge pull request #19806 from madhusudancs/replicaset-link-boilerplate 
Auto commit by PR queue bot
 2016-02-05 22:45:13 -08:00
k8s-merge-robot e3c58293b9 Merge pull request #20197 from markturansky/check_pv_by_pvc_uid 
Auto commit by PR queue bot
 2016-02-05 21:06:16 -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
Janet Kuo bb0c5fea0e Fix test failure 2016-02-05 17:26:07 -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
Janet Kuo 7e9fb97b7d Remove UniqueLabelKey from deployment spec 2016-02-05 16:21:44 -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
Chao Xu 184440f8ef rename release_1_2 to internalclientset 2016-02-05 14:02:28 -08: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
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
gmarek 0c191e787b Split controller flags between controllers 2016-02-05 12:17:51 +01:00
Marcin Wielgus 9a74a60413 Validation of HPA custom metrics annotation 2016-02-05 11:31:51 +01:00
Janet Kuo 40849a5b50 Skip apply annotation when copying annotations from deployment to RC 2016-02-04 23:30:31 -08:00
Daniel Smith d84ac764a9 Merge pull request #20492 from erictune/labselunver 
Move extensions.LabelSelector to unversioned
 2016-02-04 23:17:40 -08:00
Chao Xu 1b047f8e67 rename legacy to core 2016-02-04 14:26:56 -08:00
Eric Tune 6133cb1f21 Move extensions.LabelSelector to unversioned. 
Move type LabelSelector and type LabelSelectorRequirement from pkg/apis/extensions
This avoids an import loop when Job (and later DaemonSet, Deployment, ReplicaSet)
are moved out of extensions to new api groups.

Also Move LabelSelectorAsSelector utility from pkg/apis/extensions/ to pkg/api/unversioned/
Also its test.
Also LabelSelectorOp* constants.
Also the pkg/apis/extensions/validation functions ValidateLabelSelectorRequirement and
ValidateLabelSelector move to pkg/api/unversioned

The related type in pkg/apis/extensions/v1beta1/ is staying there.  I might move
it in another PR if neccessary.
 2016-02-04 13:46:34 -08:00
Saad Ali 0952dcd349 Merge pull request #20389 from mqliang/deployment-MinReadySeconds 
Move MinReadySeconds out of RollingUpdateDeployment
 2016-02-03 22:44:14 -08:00
k8s-merge-robot 16aa40cc33 Merge pull request #20035 from janetkuo/record-command 
Auto commit by PR queue bot
 2016-02-03 20:19:08 -08:00
k8s-merge-robot 65ebe19164 Merge pull request #20584 from caesarxuchao/release_1_2 
Auto commit by PR queue bot
 2016-02-03 19:46:27 -08:00
k8s-merge-robot d4da1ee3ce Merge pull request #19835 from janetkuo/kubectl-rollout 
Auto commit by PR queue bot
 2016-02-03 17:39:04 -08:00
Prashanth Balasubramanian 33654c8b4e Send update events from service-controller. 2016-02-03 16:50:13 -08:00
Chao Xu f9f5736b01 grep sed 2016-02-03 13:06:07 -08:00
Janet Kuo e3cb44aaff Copy deployment's annotations to its RC 2016-02-03 10:19:06 -08:00
Janet Kuo 5088d0e147 Record kubectl commands 2016-02-03 10:19:05 -08:00
Rudi Chiarito a0831a2378 Mass fix of Infof and co. missing the trailing "f", even when formatting placeholders are used 2016-02-03 11:34:59 -05:00
k8s-merge-robot 843c11e06a Merge pull request #20452 from caesarxuchao/replace-client-kubelet 
Auto commit by PR queue bot
 2016-02-02 23:46:58 -08:00
Chao Xu fe7887f1ec replace the client with clientset in controllers 2016-02-02 20:28:45 -08:00
mqliang 8e615df000 fix the HasSynced() bug for Informer 2016-02-03 11:40:11 +08:00
mqliang c4a1ab42e3 Move MinReadySeconds out of RollingUpdateDeployment 2016-02-03 11:38:11 +08:00
Jeff Lowdermilk caa9433234 Merge pull request #20433 from lavalamp/fix-bad-rv 
Add timeout, fix potential startup hang
 2016-02-02 17:27:23 -08:00
Janet Kuo 442c75045a Add kubectl rollout undo 2016-02-02 14:20:01 -08:00
k8s-merge-robot 5a099308f5 Merge pull request #20325 from mwielgus/hpa-cm-impl 
Auto commit by PR queue bot
 2016-02-02 09:22:50 -08:00
Jan Safranek 1edf34a4e5 Fixed persistent volume claim controllers processing an old claim. 
Fixes #19860 (it may be easier to look at the issue to see exact sequence
to reproduce the bug and understand the fix).

When PersistentVolumeProvisionerController.reconcileClaim() is called with the
same claim in short succession (e.g. the claim is created by an user and
at the same time periodic check of all claims is scheduled), the second
reconcileClaim() call gets an old copy of the claim as its parameter.

The method should always reload the claim to get a fresh copy with all
annotations, possibly added by previous reconcileClaim() call.


The same applies to PersistentVolumeClaimBinder.syncClaim().


Also update all the test to store claims in "fake" API server before calling
syncClaim and reconcileClaim.
 2016-02-02 13:52:07 +01:00
k8s-merge-robot 17a5058e83 Merge pull request #19893 from janetkuo/kubectl-rollout-history 
Auto commit by PR queue bot
 2016-02-02 01:13:15 -08:00
Daniel Smith 4a7d70aef1 extend fake clock 2016-02-01 15:36:15 -08:00
Janet Kuo 8fb86a3d3b Add kubectl rollout history 2016-02-01 15:32:43 -08:00
harry 1032067ff9 Replace runtime reference by pkg 2016-02-01 21:06:44 +08:00
Marcin Wielgus 05565ff7e5 CustomMetrics in HPA controller 2016-02-01 13:45:45 +01:00
Jan Safranek e2826626b1 Fixed persistent volume claim controllers processing an old volume 
We should always load the newest version of the volume from APIserver before
processing it.

When PersistentVolumeProvisionerController.reconcileVolume() is called with the
same volume in short succession (e.g. the volume is created by a provisioner
and at the same time periodic check of all volumes is scheduled), the second
reconcileVolume() call gets an old copy of the volume as its parameter and
it does not see annotations updated by the previous call.

This may result in one volume being provisioned several times, creating orphan
volumes in the cloud.

The same error is in PersistentVolumeClaimBinder.syncVolume().
 2016-02-01 10:44:31 +01:00
k8s-merge-robot dff7490c57 Merge pull request #20312 from caesarxuchao/replace-many-controllers 
Auto commit by PR queue bot
 2016-01-31 18:42:26 -08:00
Chao Xu c72d234bbf replacing handwritten client in several controllers 2016-01-31 15:42:02 -08:00
Chao Xu 90b4662d8d Add services/status path, and let the service controller uses Services.UpdateStatus() 2016-01-31 12:39:45 -08:00
Janet Kuo 3396db9510 Add rollback subresource; add rollback logic to deployment controller 2016-01-30 16:00:34 -08:00
Janet Kuo 42f712467e Use ListOptions when listing RCs in deployment 2016-01-30 12:04:35 -08:00
Janet Kuo c84a0371a2 Deployment adds version info to its new rc 2016-01-30 12:04:35 -08:00
k8s-merge-robot 783d1d00d7 Merge pull request #20139 from janetkuo/rcList-namespace 
Auto commit by PR queue bot
 2016-01-30 09:42:35 -08:00
k8s-merge-robot 5b5f170a50 Merge pull request #20239 from mwielgus/hpa-client-cm 
Auto commit by PR queue bot
 2016-01-30 08:06:05 -08:00
k8s-merge-robot ce9f93df2e Merge pull request #20061 from mikedanese/copypaste 
Auto commit by PR queue bot
 2016-01-30 05:52:26 -08:00
k8s-merge-robot 958c1daafe Merge pull request #19747 from madhusudancs/replicaset-controller 
Auto commit by PR queue bot
 2016-01-30 02:38:58 -08:00
mqliang c5cda2012a cleanup-policy 2016-01-30 09:57:21 +08:00
Fabio Yeon eb2c2d1af4 Merge pull request #20111 from fabioy/fix-tmp-tests 
Add temp directory creation method for tests.
 2016-01-29 09:51:12 -08:00
Madhusudan.C.S 119ff39f24 Implement replica set controller. 2016-01-29 09:50:43 -08:00
Marcin Wielgus a3972947cc CustomMetrics in HPA MetricsClient 2016-01-29 18:20:57 +01:00
k8s-merge-robot 28951bd66a Merge pull request #19567 from mml/forgive-me-not 
Auto commit by PR queue bot
 2016-01-29 02:49:32 -08:00
Madhusudan.C.S 73fb6dca62 DaemonSetSpec.Template should not be a pointer. 
Pod template for DaemonSets isn't optional, like Deployments and Jobs,
so the DaemonSetSpec.Template field should not be a pointer.
 2016-01-28 22:51:58 -08:00
Brian Grant 282b9eebb8 Merge pull request #20241 from janetkuo/fix-recreatedeployment 
Fix e2e test failure for RecreateDeployment
 2016-01-28 13:28:48 -08:00
Mike Danese e2fecf36b9 daemonset: apply predicated when placing daemon pods 2016-01-28 13:26:16 -08:00
Matt Liggett 0ba1b49b42 When a node becomes unreachable, do not evict DaemonSet-managed pods. 
Part of the graduation requirement for DaemonSet spelled out in #15310.
 2016-01-28 11:08:52 -08:00
Filip Grzadkowski 471e602bcd Merge pull request #20155 from mwielgus/update-heapster-api 
Update Heapster API in Godeps
 2016-01-28 14:14:27 +01:00
Marcin Wielgus b49cba7182 Update Heapster API in Godeps 2016-01-28 11:55:22 +01:00
Fabio Yeon 7205a160ac Remove all instances of "/tmp" from unit tests and replace with a common 
tmp directory creator. Exception is documented.
 2016-01-27 16:11:22 -08:00
Janet Kuo 7255af6de3 Fix e2e test failure for RecreateDeployment 2016-01-27 15:04:54 -08:00
k8s-merge-robot 458eb5284a Merge pull request #19105 from smarterclayton/prepare_negotiate 
Auto commit by PR queue bot
 2016-01-27 13:35:30 -08:00
markturansky 1ad2df6b61 verify UID when releasing and binding volumes 2016-01-27 08:43:18 -05:00
k8s-merge-robot bd7255a27e Merge pull request #18901 from kargakis/inert-deployments 
Auto commit by PR queue bot
 2016-01-27 05:14:38 -08:00
Clayton Coleman 38c7eded99 Prepare for content-type negotiation 
Combine the fields that will be used for content transformation
(content-type, codec, and group version) into a single struct in client,
and then pass that struct into the rest client and request. Set the
content-type when sending requests to the server, and accept the content
type as primary.

Will form the foundation for content-negotiation via the client.
 2016-01-26 17:44:30 -05:00
Brendan Burns f919c3bb66 Merge pull request #19973 from bprashanth/replication_controllers 
Sync pods with store before starting controllers
 2016-01-26 12:47:51 -08:00
Brendan Burns ca51446101 Merge pull request #20148 from davidopp/flake3 
Manually revert #19580 and #17754.
 2016-01-26 11:56:17 -08:00
Michail Kargakis 436d2677f9 extensions: support paused deployments 
This commit adds support for paused deployments so a user can choose
when to run a deployment that exists in the system instead of having
the deployment controller automatically reconciling it after every
change or sync interval.
 2016-01-26 12:42:26 +01:00
k8s-merge-robot a14d0fd641 Merge pull request #19382 from janetkuo/deployment-status 
Auto commit by PR queue bot
 2016-01-26 03:24:37 -08:00
k8s-merge-robot 52cb4c1d9d Merge pull request #18445 from resouer/fix-emptydir 
Auto commit by PR queue bot
 2016-01-26 02:45:54 -08:00
David Oppenheimer 85f88b8645 Run gofmt. 2016-01-25 23:25:38 -08:00
David Oppenheimer 2a6da5871a Revert #19580 and #17754. Fixes #20048. 2016-01-25 23:19:22 -08:00
Janet Kuo 14f4f1b065 Make listing deployment rcStore namespaced 2016-01-25 19:13:17 -08:00
Janet Kuo 9739a67833 Deployment status: number of available/unavailable pods 2016-01-25 14:30:15 -08:00
k8s-merge-robot d7d601b2fc Merge pull request #18876 from erictune/dynamic-job 
Auto commit by PR queue bot
 2016-01-25 08:06:22 -08:00
k8s-merge-robot d3b869ae14 Merge pull request #17922 from smarterclayton/split_codec 
Auto commit by PR queue bot
 2016-01-25 06:30:39 -08:00
harry 0fa5b6c4f7 Add e2e test for wrapper volumes 
Use git server in e2e and refactor wrapper builder

Update e2e test to use a fake git server
 2016-01-24 16:57:44 +08:00
Prashanth Balasubramanian ffd34311c6 Sync pods for daemon sets. 2016-01-22 16:42:07 -08:00
Prashanth Balasubramanian 1b93ee7b35 Sync all pods with store before starting RC Manager. 2016-01-22 16:42:02 -08:00
Eric Tune 53ee76fe1a Support Work Queue jobs with variable parallelism 
When job.spec.completions is nil, only
one task needs to succeed for the job to succeed,
and parallelism can be scaled freely during runtime.

Added tests.

Release Note:

This causes two minor changes to the API.

First, unset parallelism previously was defaulted to be
equal to completions.  Now it always defaults to 1 if unset.

Second, having parallelism=N and completions unset would previously
be defaulted to 1 completion and N parallelism.
(this is not something we expect people to do, though)
Now, no defaulting occurs in that case, and the job's
behavior is different (any completion causes success).
 2016-01-22 14:57:51 -08:00
Zach Loafman b25d596a2b Merge pull request #19630 from mikedanese/fix-test 
test: make ValidateCount throw an error instead of a log
 2016-01-22 11:08:27 -08:00
Clayton Coleman 4a6935b31f Remaining codec change refactors 2016-01-22 13:27:27 -05:00
Clayton Coleman 33085c0cf2 Update tests to handle codec changes 2016-01-22 13:27:26 -05:00
Zach Loafman f3a638de31 Merge pull request #16067 from smarterclayton/backoff_conflict 
Provide a RetryOnConflict helper for client libraries
 2016-01-22 10:23:19 -08:00
Nikhil Jindal cd2e0c490e Merge pull request #19674 from nikhiljindal/latestAndRegistered 
Merge registered and latest and move to apimachinery
 2016-01-21 17:19:49 -08:00
Alex Mohr 4ac2f7453d Merge pull request #19533 from kargakis/bloated-job-status-fix 
Fix job status conditions bloat
 2016-01-21 15:10:49 -08:00
Alex Mohr 12845ba9a5 Merge pull request #18877 from markturansky/fix_18830 
Trigger syncClaim after PV provisioning to reduce wait
 2016-01-21 15:06:46 -08:00
nikhiljindal 2ad642d370 Merge registered and latest and move to apimachinery 2016-01-21 14:42:21 -08:00
Alex Mohr ad5dce89f0 Merge pull request #19790 from mqliang/podgc-event 
remove unused eventBroadcaster in gc controller
 2016-01-21 13:54:12 -08:00
Alex Mohr a77f7205ea Merge pull request #19506 from a-robinson/goversion 
Resolve old TODO that was waiting on us to move off of go 1.3
 2016-01-21 10:42:06 -08:00
Alex Mohr 94b2490eba Merge pull request #19580 from WeixuZhuang/node 
resolve the bug when cluster CIDR is not /8
 2016-01-21 10:34:19 -08:00
Alex Mohr 8c9aa2af33 Merge pull request #19733 from janetkuo/flaky-deployment-recreate 
Fix e2e flake: Sync deployment status when with RecreateDeploymentStrategy
 2016-01-21 10:23:21 -08:00
k8s-merge-robot 6cf3a4b5f0 Merge pull request #18957 from jsafrane/devel/pv-name-tag 
Auto commit by PR queue bot
 2016-01-21 05:55:12 -08:00
Clayton Coleman 29028a1332 Fix unrelated log level error 2016-01-20 22:58:17 -05:00
Clayton Coleman 33660e001a Update service account tokens controller to use client.RetryOnConflict 2016-01-20 22:58:17 -05:00