Skip to content

Commit 8e6f1c9

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#63853 from kadisi/delete-useless-param
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. deployment: remove unused parameter 'podMap' Signed-off-by: zhangjie <iamkadisi@163.com> **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note None ```
2 parents a13fe4d + 831a2d1 commit 8e6f1c9

File tree

5 files changed

+19
-24
lines changed

5 files changed

+19
-24
lines changed

‎pkg/controller/deployment/deployment_controller.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ func (dc *DeploymentController) syncDeployment(key string) error {
608608
}
609609

610610
if d.DeletionTimestamp != nil {
611-
return dc.syncStatusOnly(d, rsList, podMap)
611+
return dc.syncStatusOnly(d, rsList)
612612
}
613613

614614
// Update deployment conditions with an Unknown condition when pausing/resuming
@@ -619,29 +619,29 @@ func (dc *DeploymentController) syncDeployment(key string) error {
619619
}
620620

621621
if d.Spec.Paused {
622-
return dc.sync(d, rsList, podMap)
622+
return dc.sync(d, rsList)
623623
}
624624

625625
// rollback is not re-entrant in case the underlying replica sets are updated with a new
626626
// revision so we should ensure that we won't proceed to update replica sets until we
627627
// make sure that the deployment has cleaned up its rollback spec in subsequent enqueues.
628628
if getRollbackTo(d) != nil {
629-
return dc.rollback(d, rsList, podMap)
629+
return dc.rollback(d, rsList)
630630
}
631631

632-
scalingEvent, err := dc.isScalingEvent(d, rsList, podMap)
632+
scalingEvent, err := dc.isScalingEvent(d, rsList)
633633
if err != nil {
634634
return err
635635
}
636636
if scalingEvent {
637-
return dc.sync(d, rsList, podMap)
637+
return dc.sync(d, rsList)
638638
}
639639

640640
switch d.Spec.Strategy.Type {
641641
case apps.RecreateDeploymentStrategyType:
642642
return dc.rolloutRecreate(d, rsList, podMap)
643643
case apps.RollingUpdateDeploymentStrategyType:
644-
return dc.rolloutRolling(d, rsList, podMap)
644+
return dc.rolloutRolling(d, rsList)
645645
}
646646
return fmt.Errorf("unexpected deployment strategy type: %s", d.Spec.Strategy.Type)
647647
}

‎pkg/controller/deployment/recreate.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
// rolloutRecreate implements the logic for recreating a replica set.
2828
func (dc *DeploymentController) rolloutRecreate(d *apps.Deployment, rsList []*apps.ReplicaSet, podMap map[types.UID]*v1.PodList) error {
2929
// Don't create a new RS if not already existed, so that we avoid scaling up before scaling down.
30-
newRS, oldRSs, err := dc.getAllReplicaSetsAndSyncRevision(d, rsList, podMap, false)
30+
newRS, oldRSs, err := dc.getAllReplicaSetsAndSyncRevision(d, rsList, false)
3131
if err != nil {
3232
return err
3333
}
@@ -51,7 +51,7 @@ func (dc *DeploymentController) rolloutRecreate(d *apps.Deployment, rsList []*ap
5151

5252
// If we need to create a new RS, create it now.
5353
if newRS == nil {
54-
newRS, oldRSs, err = dc.getAllReplicaSetsAndSyncRevision(d, rsList, podMap, true)
54+
newRS, oldRSs, err = dc.getAllReplicaSetsAndSyncRevision(d, rsList, true)
5555
if err != nil {
5656
return err
5757
}

‎pkg/controller/deployment/rollback.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@ import (
2525
apps "k8s.io/api/apps/v1"
2626
"k8s.io/api/core/v1"
2727
extensions "k8s.io/api/extensions/v1beta1"
28-
"k8s.io/apimachinery/pkg/types"
2928
deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util"
3029
)
3130

3231
// rollback the deployment to the specified revision. In any case cleanup the rollback spec.
33-
func (dc *DeploymentController) rollback(d *apps.Deployment, rsList []*apps.ReplicaSet, podMap map[types.UID]*v1.PodList) error {
34-
newRS, allOldRSs, err := dc.getAllReplicaSetsAndSyncRevision(d, rsList, podMap, true)
32+
func (dc *DeploymentController) rollback(d *apps.Deployment, rsList []*apps.ReplicaSet) error {
33+
newRS, allOldRSs, err := dc.getAllReplicaSetsAndSyncRevision(d, rsList, true)
3534
if err != nil {
3635
return err
3736
}

‎pkg/controller/deployment/rolling.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,14 @@ import (
2222

2323
"github.com/golang/glog"
2424
apps "k8s.io/api/apps/v1"
25-
"k8s.io/api/core/v1"
26-
"k8s.io/apimachinery/pkg/types"
2725
"k8s.io/client-go/util/integer"
2826
"k8s.io/kubernetes/pkg/controller"
2927
deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util"
3028
)
3129

3230
// rolloutRolling implements the logic for rolling a new replica set.
33-
func (dc *DeploymentController) rolloutRolling(d *apps.Deployment, rsList []*apps.ReplicaSet, podMap map[types.UID]*v1.PodList) error {
34-
newRS, oldRSs, err := dc.getAllReplicaSetsAndSyncRevision(d, rsList, podMap, true)
31+
func (dc *DeploymentController) rolloutRolling(d *apps.Deployment, rsList []*apps.ReplicaSet) error {
32+
newRS, oldRSs, err := dc.getAllReplicaSetsAndSyncRevision(d, rsList, true)
3533
if err != nil {
3634
return err
3735
}

‎pkg/controller/deployment/sync.go

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,15 @@ import (
2727
"k8s.io/api/core/v1"
2828
"k8s.io/apimachinery/pkg/api/errors"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
30-
"k8s.io/apimachinery/pkg/types"
3130
"k8s.io/apimachinery/pkg/util/rand"
3231
"k8s.io/kubernetes/pkg/controller"
3332
deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util"
3433
labelsutil "k8s.io/kubernetes/pkg/util/labels"
3534
)
3635

3736
// syncStatusOnly only updates Deployments Status and doesn't take any mutating actions.
38-
func (dc *DeploymentController) syncStatusOnly(d *apps.Deployment, rsList []*apps.ReplicaSet, podMap map[types.UID]*v1.PodList) error {
39-
newRS, oldRSs, err := dc.getAllReplicaSetsAndSyncRevision(d, rsList, podMap, false)
37+
func (dc *DeploymentController) syncStatusOnly(d *apps.Deployment, rsList []*apps.ReplicaSet) error {
38+
newRS, oldRSs, err := dc.getAllReplicaSetsAndSyncRevision(d, rsList, false)
4039
if err != nil {
4140
return err
4241
}
@@ -47,8 +46,8 @@ func (dc *DeploymentController) syncStatusOnly(d *apps.Deployment, rsList []*app
4746

4847
// sync is responsible for reconciling deployments on scaling events or when they
4948
// are paused.
50-
func (dc *DeploymentController) sync(d *apps.Deployment, rsList []*apps.ReplicaSet, podMap map[types.UID]*v1.PodList) error {
51-
newRS, oldRSs, err := dc.getAllReplicaSetsAndSyncRevision(d, rsList, podMap, false)
49+
func (dc *DeploymentController) sync(d *apps.Deployment, rsList []*apps.ReplicaSet) error {
50+
newRS, oldRSs, err := dc.getAllReplicaSetsAndSyncRevision(d, rsList, false)
5251
if err != nil {
5352
return err
5453
}
@@ -106,7 +105,6 @@ func (dc *DeploymentController) checkPausedConditions(d *apps.Deployment) error
106105
// getAllReplicaSetsAndSyncRevision returns all the replica sets for the provided deployment (new and all old), with new RS's and deployment's revision updated.
107106
//
108107
// rsList should come from getReplicaSetsForDeployment(d).
109-
// podMap should come from getPodMapForDeployment(d, rsList).
110108
//
111109
// 1. Get all old RSes this deployment targets, and calculate the max revision number among them (maxOldV).
112110
// 2. Get new RS this deployment targets (whose pod template matches deployment's), and update new RS's revision number to (maxOldV + 1),
@@ -115,7 +113,7 @@ func (dc *DeploymentController) checkPausedConditions(d *apps.Deployment) error
115113
//
116114
// Note that currently the deployment controller is using caches to avoid querying the server for reads.
117115
// This may lead to stale reads of replica sets, thus incorrect deployment status.
118-
func (dc *DeploymentController) getAllReplicaSetsAndSyncRevision(d *apps.Deployment, rsList []*apps.ReplicaSet, podMap map[types.UID]*v1.PodList, createIfNotExisted bool) (*apps.ReplicaSet, []*apps.ReplicaSet, error) {
116+
func (dc *DeploymentController) getAllReplicaSetsAndSyncRevision(d *apps.Deployment, rsList []*apps.ReplicaSet, createIfNotExisted bool) (*apps.ReplicaSet, []*apps.ReplicaSet, error) {
119117
_, allOldRSs := deploymentutil.FindOldReplicaSets(d, rsList)
120118

121119
// Get new replica set with the updated revision number
@@ -520,8 +518,8 @@ func calculateStatus(allRSs []*apps.ReplicaSet, newRS *apps.ReplicaSet, deployme
520518
//
521519
// rsList should come from getReplicaSetsForDeployment(d).
522520
// podMap should come from getPodMapForDeployment(d, rsList).
523-
func (dc *DeploymentController) isScalingEvent(d *apps.Deployment, rsList []*apps.ReplicaSet, podMap map[types.UID]*v1.PodList) (bool, error) {
524-
newRS, oldRSs, err := dc.getAllReplicaSetsAndSyncRevision(d, rsList, podMap, false)
521+
func (dc *DeploymentController) isScalingEvent(d *apps.Deployment, rsList []*apps.ReplicaSet) (bool, error) {
522+
newRS, oldRSs, err := dc.getAllReplicaSetsAndSyncRevision(d, rsList, false)
525523
if err != nil {
526524
return false, err
527525
}

0 commit comments

Comments
 (0)