31d0869f83 
								
							 
						 
						
							
							
								
								revert 45764  
							
							
							
						 
						
							2017-06-25 21:41:10 -07:00  
				
					
						
							
							
								 
						
							
								60604f8818 
								
							 
						 
						
							
							
								
								run hack/update-all  
							
							
							
						 
						
							2017-06-22 11:31:03 -07:00  
				
					
						
							
							
								 
						
							
								cde4772928 
								
							 
						 
						
							
							
								
								run ./root-rewrite-all-other-apis.sh, then run make all, pkg/... compiles  
							
							
							
						 
						
							2017-06-22 11:30:52 -07:00  
				
					
						
							
							
								 
						
							
								f4989a45a5 
								
							 
						 
						
							
							
								
								run root-rewrite-v1-..., compile  
							
							
							
						 
						
							2017-06-22 10:25:57 -07:00  
				
					
						
							
							
								 
						
							
								ff503dbc32 
								
							 
						 
						
							
							
								
								delete dependent pods for rs when deleting deployments  
							
							
							
						 
						
							2017-06-14 12:52:02 -07:00  
				
					
						
							
							
								 
						
							
								0035d86248 
								
							 
						 
						
							
							
								
								Update adoption/release of DaemonSet controller history  
							
							
							
						 
						
							2017-06-12 23:33:31 -07:00  
				
					
						
							
							
								 
						
							
								b9611b95f4 
								
							 
						 
						
							
							
								
								Skip pods and replica sets marked for deletion  
							
							... 
							
							
							
							Fixes  #44144  
						
							2017-04-23 00:29:48 +02:00  
				
					
						
							
							
								 
						
							
								b4b8fdbca3 
								
							 
						 
						
							
							
								
								GC: Fix re-adoption race when orphaning dependents.  
							
							... 
							
							
							
							The GC expects that once it sees a controller with a non-nil
DeletionTimestamp, that controller will not attempt any adoption.
There was a known race condition that could cause a controller to
re-adopt something orphaned by the GC, because the controller is using a
cached value of its own spec from before DeletionTimestamp was set.
This fixes that race by doing an uncached quorum read of the controller
spec just before the first adoption attempt. It's important that this
read occurs after listing potential orphans. Note that this uncached
read is skipped if no adoptions are attempted (i.e. at steady state). 
							
						 
						
							2017-03-17 15:39:26 -07:00  
				
					
						
							
							
								 
						
							
								d306acca86 
								
							 
						 
						
							
							
								
								Merge pull request  #42175  from enisoc/controller-ref-dep  
							
							... 
							
							
							
							Automatic merge from submit-queue
Deployment: Fully Respect ControllerRef
**What this PR does / why we need it**:
This is part of the completion of the [ControllerRef](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/controller-ref.md ) proposal. It brings Deployment into full compliance with ControllerRef. See the individual commit messages for details.
**Which issue this PR fixes**:
This ensures that Deployment does not fight with other controllers over control of Pods and ReplicaSets.
Ref: https://github.com/kubernetes/kubernetes/issues/24433 
**Special notes for your reviewer**:
**Release note**:
```release-note
Deployment now fully respects ControllerRef to avoid fighting over Pods and ReplicaSets. At the time of upgrade, **you must not have Deployments with selectors that overlap**, or else [ownership of ReplicaSets may change](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/controller-ref.md#upgrading ).
```
cc @erictune @kubernetes/sig-apps-pr-reviews 
							
						 
						
							2017-03-07 20:44:36 -08:00  
				
					
						
							
							
								 
						
							
								37534b66df 
								
							 
						 
						
							
							
								
								Deployment: Always set BlockOwnerDeletion in ControllerRef.  
							
							
							
						 
						
							2017-03-06 15:12:07 -08:00  
				
					
						
							
							
								 
						
							
								b7163bdb75 
								
							 
						 
						
							
							
								
								ControllerRefManager: Allow matching by more than just selector.  
							
							
							
						 
						
							2017-03-06 09:46:03 -08:00  
				
					
						
							
							
								 
						
							
								01d025a7cc 
								
							 
						 
						
							
							
								
								ControllerRefManager: Don't always filter inactive Pods.  
							
							... 
							
							
							
							Some controllers, like DaemonSet, want to see all Pods. 
							
						 
						
							2017-03-01 15:43:51 -08:00  
				
					
						
							
							
								 
						
							
								c3baf402f5 
								
							 
						 
						
							
							
								
								gc changes  
							
							
							
						 
						
							2017-02-28 23:05:41 -08:00  
				
					
						
							
							
								 
						
							
								70bd5fdfe5 
								
							 
						 
						
							
							
								
								Refactor ControllerRefManager  
							
							... 
							
							
							
							To prepare for implementing ControllerRef across all controllers,
this pushes the common adopt/orphan logic into ControllerRefManager
so each controller doesn't have to duplicate it.
This also shares the adopt/orphan logic between Pods and ReplicaSets,
so it lives in only one place. 
							
						 
						
							2017-02-16 15:09:17 -08:00  
				
					
						
							
							
								 
						
							
								36809e2c2e 
								
							 
						 
						
							
							
								
								Merge pull request  #39366  from zdj6373/manager-log  
							
							... 
							
							
							
							Automatic merge from submit-queue (batch tested with PRs 40527, 40738, 39366, 40609, 40748)
Log rectification
Log error, modify 
							
						 
						
							2017-01-31 15:49:43 -08:00  
				
					
						
							
							
								 
						
							
								9a2a50cda7 
								
							 
						 
						
							
							
								
								refactor: use metav1.ObjectMeta in other types  
							
							
							
						 
						
							2017-01-17 16:17:19 -05:00  
				
					
						
							
							
								 
						
							
								77b4d55982 
								
							 
						 
						
							
							
								
								mechanical  
							
							
							
						 
						
							2017-01-16 09:35:12 -05:00  
				
					
						
							
							
								 
						
							
								540f3bb7f8 
								
							 
						 
						
							
							
								
								Log rectification,review  
							
							
							
						 
						
							2017-01-14 10:17:06 +08:00  
				
					
						
							
							
								 
						
							
								6a4d5cd7cc 
								
							 
						 
						
							
							
								
								start the apimachinery repo  
							
							
							
						 
						
							2017-01-11 09:09:48 -05:00  
				
					
						
							
							
								 
						
							
								d1292a7397 
								
							 
						 
						
							
							
								
								Optimize memory allocations in controller manager  
							
							
							
						 
						
							2016-12-27 16:11:11 +01:00  
				
					
						
							
							
								 
						
							
								777977612b 
								
							 
						 
						
							
							
								
								ReplicaSet has owner ref of the Deployment that created it  
							
							
							
						 
						
							2016-12-22 16:45:50 -08:00  
				
					
						
							
							
								 
						
							
								7ef3e6f7c9 
								
							 
						 
						
							
							
								
								controller: wait for all pods to be deleted before Recreating  
							
							
							
						 
						
							2016-12-15 19:55:18 +01:00  
				
					
						
							
							
								 
						
							
								c52d510a24 
								
							 
						 
						
							
							
								
								refactor: generated  
							
							
							
						 
						
							2016-12-10 18:05:53 -05:00  
				
					
						
							
							
								 
						
							
								3c72ee2189 
								
							 
						 
						
							
							
								
								Change references to OwnerReference  
							
							
							
						 
						
							2016-12-10 18:05:36 -05:00  
				
					
						
							
							
								 
						
							
								35a6bfbcee 
								
							 
						 
						
							
							
								
								generated: refactor  
							
							
							
						 
						
							2016-11-23 22:30:47 -06:00  
				
					
						
							
							
								 
						
							
								7eeb71f698 
								
							 
						 
						
							
							
								
								cmd/kube-controller-manager  
							
							
							
						 
						
							2016-11-23 15:53:09 -08:00  
				
					
						
							
							
								 
						
							
								594234d61c 
								
							 
						 
						
							
							
								
								fix tests; convert IsPodActive to operate on *Pod  
							
							
							
						 
						
							2016-08-17 13:05:37 -07:00  
				
					
						
							
							
								 
						
							
								331083727f 
								
							 
						 
						
							
							
								
								Change podNamespacer API  
							
							
							
						 
						
							2016-08-17 16:55:01 +02:00  
				
					
						
							
							
								 
						
							
								11a341de67 
								
							 
						 
						
							
							
								
								let RC manager utilize the GC  
							
							
							
						 
						
							2016-07-14 19:59:31 -07:00