Skip to content

Commit

Permalink
bugfix: backport 191 fix to Release-0.4 (bugfix: Filter rs that are n…
Browse files Browse the repository at this point in the history
…ot part of the current Deployement)

Signed-off-by: vvhuang-ll <[email protected]>
  • Loading branch information
vvhuang-ll committed Dec 12, 2024
1 parent b72837d commit a430bf9
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion pkg/controller/deployment/deployment_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,22 @@ func (dc *DeploymentController) getReplicaSetsForDeployment(ctx context.Context,
}
// List all ReplicaSets to find those we own but that no longer match our
// selector. They will be orphaned by ClaimReplicaSets().
return dc.rsLister.ReplicaSets(d.Namespace).List(deploymentSelector)
allRSs, err := dc.rsLister.ReplicaSets(d.Namespace).List(deploymentSelector)
if err != nil {
return nil, fmt.Errorf("list %s/%s rs failed:%v", d.Namespace, d.Name, err)
}
// select rs owner by current deployment
ownedRSs := make([]*apps.ReplicaSet, 0)
for _, rs := range allRSs {
if !rs.DeletionTimestamp.IsZero() {
continue
}

if metav1.IsControlledBy(rs, d) {
ownedRSs = append(ownedRSs, rs)
}
}
return ownedRSs, nil
}

// syncDeployment will sync the deployment with the given key.
Expand Down

0 comments on commit a430bf9

Please sign in to comment.