k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						3166f9316f 
					 
					
						
						
							
							Merge pull request  #28111  from mfojtik/min-ready-seconds  
						
						 
						
						... 
						
						
						
						Automatic merge from submit-queue
Add MinReadySeconds to rolling updater
Add MinReadySeconds support to RollingUpdater that allows to specify the number of seconds to wait on top of the pod is "ready" because its readiness probe passed. 
						
						
					 
					
						2016-07-01 19:21:16 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michal Fojtik 
							
						 
					 
					
						
						
							
						
						7ea28e42c0 
					 
					
						
						
							
							Add MinReadySeconds to rolling updater  
						
						 
						
						
						
						
					 
					
						2016-06-30 13:13:08 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David McMahon 
							
						 
					 
					
						
						
							
						
						ef0c9f0c5b 
					 
					
						
						
							
							Remove "All rights reserved" from all the headers.  
						
						 
						
						
						
						
					 
					
						2016-06-29 17:47:36 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michail Kargakis 
							
						 
					 
					
						
						
							
						
						f3d2e3ff22 
					 
					
						
						
							
							controller: proportionally scale paused and rolling deployments  
						
						 
						
						... 
						
						
						
						Enable paused and rolling deployments to be proportionally scaled.
Also have cleanup policy work for paused deployments. 
						
						
					 
					
						2016-06-20 12:13:35 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						764df2e096 
					 
					
						
						
							
							Listing pods only once when getting pods for RS in deployment  
						
						 
						
						
						
						
					 
					
						2016-06-10 09:55:28 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						c3d905776e 
					 
					
						
						
							
							Avoid comparing pod-template-hash when getting a deployment's new/old RSes  
						
						 
						
						
						
						
					 
					
						2016-06-06 17:09:35 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						57ec715c61 
					 
					
						
						
							
							Address comments  
						
						 
						
						
						
						
					 
					
						2016-06-01 15:00:29 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						2ced966cd5 
					 
					
						
						
							
							List RSes once when getting old/new RSes in deployment e2e tests  
						
						 
						
						
						
						
					 
					
						2016-06-01 14:19:35 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						f3b1aaeca6 
					 
					
						
						
							
							Fix incorrect comments in IsPodAvailable  
						
						 
						
						
						
						
					 
					
						2016-05-03 13:05:02 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Clayton Coleman 
							
						 
					 
					
						
						
							
						
						fdb110c859 
					 
					
						
						
							
							Fix the rest of the code  
						
						 
						
						
						
						
					 
					
						2016-04-29 17:12:10 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						26bcdb1bd6 
					 
					
						
						
							
							Separate GetOldRS and GetNewRS in deployment controller (get and mutate) and deployment util (get only)  
						
						 
						
						
						
						
					 
					
						2016-03-15 10:23:20 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chao Xu 
							
						 
					 
					
						
						
							
						
						a6240c1ab8 
					 
					
						
						
							
							add FullyLabeledReplicas in Replicaset Status and ReplicationController Status  
						
						 
						
						
						
						
					 
					
						2016-03-11 23:55:04 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Madhusudan.C.S 
							
						 
					 
					
						
						
							
						
						db48dcf583 
					 
					
						
						
							
							ReplicaSetSpec.Template shouldn't be a pointer.  
						
						 
						
						... 
						
						
						
						PodTemplateSpec should be consistent for all the types in extensions/v1beta1.
See PR #19510 . 
						
						
					 
					
						2016-03-09 21:24:16 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michail Kargakis 
							
						 
					 
					
						
						
							
						
						77097d9a20 
					 
					
						
						
							
							kubectl: set maxUnavailable to 1 if both fenceposts resolve to zero  
						
						 
						
						... 
						
						
						
						Due to rounding down for maxUnavailable, we may end up with rolling updates
that have zero surge and unavailable pods something that 1) is not allowed
as per validation, 2) blocks updates. If we end up in such a situation
set maxUnavailable to 1 on the theory that surge might not work due to
quota. 
						
						
					 
					
						2016-03-07 13:03:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						e91048ea96 
					 
					
						
						
							
							Merge pull request  #22392  from janetkuo/retry-update-precondition  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-03-04 19:21:14 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						f666e87217 
					 
					
						
						
							
							Filter out inactive pods first when determining if it's available  
						
						 
						
						
						
						
					 
					
						2016-03-04 16:32:32 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						64731e8083 
					 
					
						
						
							
							Address comments  
						
						 
						
						
						
						
					 
					
						2016-03-03 15:56:09 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						aae2073a78 
					 
					
						
						
							
							Add preconditions to pod/rs update retry func  
						
						 
						
						
						
						
					 
					
						2016-03-03 14:54:28 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						75e570832b 
					 
					
						
						
							
							Ignore not found error when retrying rs and pods updates  
						
						 
						
						
						
						
					 
					
						2016-03-03 11:45:55 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Grant 
							
						 
					 
					
						
						
							
						
						4b213ed263 
					 
					
						
						
							
							Merge pull request  #22245  from nikhiljindal/deploymentTimeoutErrors  
						
						 
						
						... 
						
						
						
						Improving deployment e2e failure error messages 
						
						
					 
					
						2016-03-01 18:46:13 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Grant 
							
						 
					 
					
						
						
							
						
						6deb2612dc 
					 
					
						
						
							
							Merge pull request  #22243  from nikhiljindal/updatePodWithRetries  
						
						 
						
						... 
						
						
						
						deployment e2e flake: Fix updatePodWithRetries to get and then immediately try update 
						
						
					 
					
						2016-03-01 18:44:17 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nikhiljindal 
							
						 
					 
					
						
						
							
						
						0dae82f6f1 
					 
					
						
						
							
							Improving deployment e2e failure error messages  
						
						 
						
						
						
						
					 
					
						2016-03-01 17:58:32 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nikhiljindal 
							
						 
					 
					
						
						
							
						
						b65180c314 
					 
					
						
						
							
							Update updatePodWithRetries to get and then update  
						
						 
						
						
						
						
					 
					
						2016-03-01 14:40:21 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prashanth Balasubramanian 
							
						 
					 
					
						
						
							
						
						b9eb552e07 
					 
					
						
						
							
							Update the re-fetched pod with deployment labels.  
						
						 
						
						
						
						
					 
					
						2016-03-01 11:47:53 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Grant 
							
						 
					 
					
						
						
							
						
						d0dd4f8a93 
					 
					
						
						
							
							Restore expectation timeout to 5 minutes. Fix enqueueDeployment. Pass by reference.  
						
						 
						
						... 
						
						
						
						Make names of ReplicaSets created by Deployment deterministic for idempotence.
Eliminate use of expectations in Deployment controller. 
						
						
					 
					
						2016-02-28 07:33:07 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Grant 
							
						 
					 
					
						
						
							
						
						b27edde38d 
					 
					
						
						
							
							Merge pull request  #21957  from mqliang/deployment-preserve-availability  
						
						 
						
						... 
						
						
						
						Deployment: preserve availability when maxUnavailability is not 100% 
						
						
					 
					
						2016-02-24 22:09:54 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Grant 
							
						 
					 
					
						
						
							
						
						be6515ca90 
					 
					
						
						
							
							Merge pull request  #21935  from janetkuo/nil-pointer  
						
						 
						
						... 
						
						
						
						Fix the nil pointer dereference when counting RS replicas 
						
						
					 
					
						2016-02-24 21:58:41 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mqliang 
							
						 
					 
					
						
						
							
						
						06d57ec7f4 
					 
					
						
						
							
							Deployment: preserve availability when maxUnavailability is not 100%  
						
						 
						
						
						
						
					 
					
						2016-02-25 13:30:06 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						069e77d504 
					 
					
						
						
							
							Fix the nil pointer dereference when counting RS replicas  
						
						 
						
						
						
						
					 
					
						2016-02-24 18:27:27 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						3ed8426a98 
					 
					
						
						
							
							When calculating pod template hash, don't include the hash label  
						
						 
						
						
						
						
					 
					
						2016-02-24 18:09:59 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						96908d6de5 
					 
					
						
						
							
							Add more logs  
						
						 
						
						
						
						
					 
					
						2016-02-24 16:41:36 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						082702390a 
					 
					
						
						
							
							Fix test flake  
						
						 
						
						
						
						
					 
					
						2016-02-24 16:41:36 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						020ab8813d 
					 
					
						
						
							
							Check observed generation only after rs template is labeled in addHashKeyToRSAndPods  
						
						 
						
						
						
						
					 
					
						2016-02-24 16:41:36 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						1d1c6f19b4 
					 
					
						
						
							
							Fix the nil pointer dereference in addHashKeyToRSAndPods  
						
						 
						
						
						
						
					 
					
						2016-02-24 16:41:36 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Grant 
							
						 
					 
					
						
						
							
						
						88056edab2 
					 
					
						
						
							
							Merge pull request  #21902  from janetkuo/deployment-unavailable-replicas  
						
						 
						
						... 
						
						
						
						Fix the incorrect deployment.status.unavailableReplicas 
						
						
					 
					
						2016-02-24 14:48:04 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Grant 
							
						 
					 
					
						
						
							
						
						0b5edab208 
					 
					
						
						
							
							Merge pull request  #21857  from nikhiljindal/stopDeployment  
						
						 
						
						... 
						
						
						
						fix deployment e2e flake: Update DeploymentReaper.Stop to use ObservedGeneration 
						
						
					 
					
						2016-02-24 14:26:23 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						062b9f86b9 
					 
					
						
						
							
							Fix the incorrect deployment.status.unavailableReplicas  
						
						 
						
						
						
						
					 
					
						2016-02-24 14:09:49 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Grant 
							
						 
					 
					
						
						
							
						
						832bc37ee4 
					 
					
						
						
							
							Merge pull request  #21713  from janetkuo/deployment-actual-replicas  
						
						 
						
						... 
						
						
						
						Report actual replicas in deployment status 
						
						
					 
					
						2016-02-24 13:55:16 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nikhiljindal 
							
						 
					 
					
						
						
							
						
						7e50fa6df0 
					 
					
						
						
							
							Update DeploymentReaper.Stop to use ObservedGeneration to remove race condition  
						
						 
						
						
						
						
					 
					
						2016-02-24 00:09:44 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						82dcc56fe3 
					 
					
						
						
							
							Improve log for debug  
						
						 
						
						
						
						
					 
					
						2016-02-23 17:52:24 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						3901423272 
					 
					
						
						
							
							Report actual replicas in deployment status  
						
						 
						
						
						
						
					 
					
						2016-02-22 14:28:28 -08: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						b267ede42c 
					 
					
						
						
							
							Address comments  
						
						 
						
						
						
						
					 
					
						2016-02-19 15:58:33 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						6ceb221f8e 
					 
					
						
						
							
							Log pods of RS when deployment e2e test fails  
						
						 
						
						
						
						
					 
					
						2016-02-19 15:55:22 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						eb45154996 
					 
					
						
						
							
							Merge pull request  #21348  from caesarxuchao/generate-fake-for-1-2  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-18 23:02:05 -08:00