Merge pull request #11270 from yuexiao-wang/remove-para

Merged by openshift-bot
openshift · Oct 13, 2016 · 66a729c · 66a729c
2 parents 65c13a5 + 8127e85
commit 66a729c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pkg/cmd/cli/describe/deployments.go b/pkg/cmd/cli/describe/deployments.go
@@ -94,7 +94,7 @@ func (d *DeploymentConfigDescriber) Describe(namespace, name string, settings kc
 		fmt.Fprintln(out)
 
 		latestDeploymentName := deployutil.LatestDeploymentNameForConfig(deploymentConfig)
-		if activeDeployment := deployutil.ActiveDeployment(deploymentConfig, deploymentsHistory); activeDeployment != nil {
+		if activeDeployment := deployutil.ActiveDeployment(deploymentsHistory); activeDeployment != nil {
 			activeDeploymentName = activeDeployment.Name
 		}
 

diff --git a/pkg/deploy/controller/deploymentconfig/controller.go b/pkg/deploy/controller/deploymentconfig/controller.go
@@ -216,7 +216,7 @@ func (c *DeploymentConfigController) reconcileDeployments(existingDeployments []
 		// can't hurt.
 		return c.updateStatus(config, existingDeployments)
 	}
-	activeDeployment := deployutil.ActiveDeployment(config, existingDeployments)
+	activeDeployment := deployutil.ActiveDeployment(existingDeployments)
 	// Compute the replica count for the active deployment (even if the active
 	// deployment doesn't exist). The active replica count is the value that
 	// should be assigned to the config, to allow the replica propagation to

diff --git a/pkg/deploy/util/util.go b/pkg/deploy/util/util.go
@@ -113,7 +113,7 @@ func LatestDeploymentInfo(config *deployapi.DeploymentConfig, deployments []api.
 // ActiveDeployment returns the latest complete deployment, or nil if there is
 // no such deployment. The active deployment is not always the same as the
 // latest deployment.
-func ActiveDeployment(config *deployapi.DeploymentConfig, input []api.ReplicationController) *api.ReplicationController {
+func ActiveDeployment(input []api.ReplicationController) *api.ReplicationController {
 	var activeDeployment *api.ReplicationController
 	var lastCompleteDeploymentVersion int64 = 0
 	for i := range input {
@@ -523,7 +523,7 @@ func DeploymentsForCleanup(configuration *deployapi.DeploymentConfig, deployment
 	sort.Sort(ByLatestVersionAsc(deployments))
 
 	relevantDeployments := []api.ReplicationController{}
-	activeDeployment := ActiveDeployment(configuration, deployments)
+	activeDeployment := ActiveDeployment(deployments)
 	if activeDeployment == nil {
 		// if cleanup policy is set but no successful deployments have happened, there will be
 		// no active deployment. We can consider all of the deployments in this case except for